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.16.2.1
retrieving revision 1.17
diff -u -p -r1.16.2.1 -r1.17
--- src/sys/arch/arm/sa11x0/sa11x0_irq.S	2014/08/20 00:02:47	1.16.2.1
+++ src/sys/arch/arm/sa11x0/sa11x0_irq.S	2013/08/18 06:28:18	1.17
@@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0_irq.S,v 1.16.2.1 2014/08/20 00:02:47 tls Exp $	*/
+/*	$NetBSD: sa11x0_irq.S,v 1.17 2013/08/18 06:28:18 matt Exp $	*/
 
 /*
  * Copyright (c) 1998 Mark Brinicombe.
@@ -150,7 +150,7 @@ Lfind_highest_ipl:
 	bl	_C_LABEL(printf)
 	ldmia	sp!, {r0,r1,r2}
 #endif
-        mrs     r0, cpsr		/* Enable IRQs */
+        mrs     r0, cpsr_all		/* Enable IRQs */
 	bic	r0, r0, #I32_bit
 	msr	cpsr_all, r0
 
@@ -234,7 +234,7 @@ nextirq:
 #endif
 
 	/* Kill IRQ's in preparation for exit */
-        mrs     r0, cpsr
+        mrs     r0, cpsr_all
         orr     r0, r0, #(I32_bit)
         msr     cpsr_all, r0
 
@@ -262,7 +262,7 @@ ENTRY(irq_setmasks)
 	stmfd	sp!, {r0, r1, r4, lr}	/* Preserve registers */
 
 	/* Disable interrupts */
-	mrs	r1, cpsr
+	mrs	r1, cpsr_all
 	orr	r3, r1,  #(I32_bit)
 	msr	cpsr_all, r3