[PATCH] ARM: Remove argument for disable_irq/enable_irq

[mv-sheeva.git] / arch / arm / kernel / entry-header.S

diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 4039d8c120b57446a02687993f8aed6721a5bb81..109f4f10d314db798fe1e2089f4515cca87523e4 100644 (file)
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -63,25 +63,21 @@
 #define S_R0           0
 #define S_OFF          8
 
-       .macro  set_cpsr_c, reg, mode
-       msr     cpsr_c, \mode
-       .endm
-
 #if __LINUX_ARM_ARCH__ >= 6
-       .macro  disable_irq, temp
+       .macro  disable_irq
        cpsid   i
        .endm
 
-       .macro  enable_irq, temp
+       .macro  enable_irq
        cpsie   i
        .endm
 #else
-       .macro  disable_irq, temp
-       set_cpsr_c \temp, #PSR_I_BIT | MODE_SVC
+       .macro  disable_irq
+       msr     cpsr_c, #PSR_I_BIT | SVC_MODE
        .endm
 
-       .macro  enable_irq, temp
-       set_cpsr_c \temp, #MODE_SVC
+       .macro  enable_irq
+       msr     cpsr_c, #SVC_MODE
        .endm
 #endif