Merge branch 'master'

1 files changed, 22 insertions, 5 deletions

diff --git a/include/asm-arm/assembler.h b/include/asm-arm/assembler.h
index f31ac92b6c7f..d53bafa9bf1c 100644
--- a/include/asm-arm/assembler.h
+++ b/include/asm-arm/assembler.h
@@ -80,16 +80,33 @@
         instr   regs
 
 /*
- * Save the current IRQ state and disable IRQs.  Note that this macro
- * assumes FIQs are enabled, and that the processor is in SVC mode.
+ * Enable and disable interrupts
  */
-        .macro  save_and_disable_irqs, oldcpsr
-        mrs     \oldcpsr, cpsr
 #if __LINUX_ARM_ARCH__ >= 6
+        .macro  disable_irq
         cpsid   i
+        .endm
+
+        .macro  enable_irq
+        cpsie   i
+        .endm
 #else
-        msr     cpsr_c, #PSR_I_BIT | MODE_SVC
+        .macro  disable_irq
+        msr     cpsr_c, #PSR_I_BIT | SVC_MODE
+        .endm
+
+        .macro  enable_irq
+        msr     cpsr_c, #SVC_MODE
+        .endm
 #endif
+
+/*
+ * 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
+        mrs     \oldcpsr, cpsr
+        disable_irq
         .endm
 
 /*