Merge ../linux-2.6

[linux-2.6] / include / asm-arm / assembler.h

diff --git a/include/asm-arm/assembler.h b/include/asm-arm/assembler.h
index 69a28f96bee2ee14994a11d9fba1516306496534..f31ac92b6c7f1c0f69dc90e861a0bad367ff6c5e 100644 (file)
--- a/include/asm-arm/assembler.h
+++ b/include/asm-arm/assembler.h
@@ -83,10 +83,13 @@
  * Save the current IRQ state and disable IRQs.  Note that this macro
  * assumes FIQs are enabled, and that the processor is in SVC mode.
  */
-       .macro  save_and_disable_irqs, oldcpsr, temp
+       .macro  save_and_disable_irqs, oldcpsr
        mrs     \oldcpsr, cpsr
-       mov     \temp, #PSR_I_BIT | MODE_SVC
-       msr     cpsr_c, \temp
+#if __LINUX_ARM_ARCH__ >= 6
+       cpsid   i
+#else
+       msr     cpsr_c, #PSR_I_BIT | MODE_SVC
+#endif
        .endm
 
 /*