Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/arm/sa11x0/sa11x0_irq.S,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/arm/sa11x0/sa11x0_irq.S,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.10
retrieving revision 1.10.34.1
diff -u -p -r1.10 -r1.10.34.1
--- src/sys/arch/arm/sa11x0/sa11x0_irq.S	2007/03/09 19:21:59	1.10
+++ src/sys/arch/arm/sa11x0/sa11x0_irq.S	2008/01/08 22:09:32	1.10.34.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0_irq.S,v 1.10 2007/03/09 19:21:59 thorpej Exp $	*/
+/*	$NetBSD: sa11x0_irq.S,v 1.10.34.1 2008/01/08 22:09:32 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1998 Mark Brinicombe.
@@ -53,7 +53,7 @@ Lcurrent_spl_level:	
 	.word	_C_LABEL(current_spl_level)
 
 Lcurrent_intr_depth:
-	.word	_C_LABEL(current_intr_depth)
+	.word	_C_LABEL(cpu_info_store) + CI_IDEPTH
 
 Lspl_masks:
 	.word	_C_LABEL(spl_masks)
@@ -226,7 +226,9 @@ nextirq:
 	/* Restore previous disabled mask */
 	bl	_C_LABEL(irq_setmasks)
 
+#ifdef __HAVE_FAST_SOFTINTS
 	bl	_C_LABEL(dosoftints)	/* Handle the soft interrupts */
+#endif
 
 	/* Kill IRQ's in preparation for exit */
         mrs     r0, cpsr_all