summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/entry-header.S
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-04-26 15:18:26 +0100
committerRussell King <rmk@dyn-67.arm.linux.org.uk>2005-04-26 15:18:26 +0100
commit1ec42c0c97186fadc48810ccaf2dc573cd957ea1 (patch)
tree5476806ed2a9a37409a01b638c9cd62d0ca966a0 /arch/arm/kernel/entry-header.S
parent7933523dc75823342dbd70a27760a82a5302baf4 (diff)
downloadlinux-1ec42c0c97186fadc48810ccaf2dc573cd957ea1.tar.gz
linux-1ec42c0c97186fadc48810ccaf2dc573cd957ea1.tar.bz2
linux-1ec42c0c97186fadc48810ccaf2dc573cd957ea1.zip
[PATCH] ARM: Remove argument for disable_irq/enable_irq
Since we do not require a register for these operations, we can remove this unnecessary argument. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/entry-header.S')
-rw-r--r--arch/arm/kernel/entry-header.S16
1 files changed, 6 insertions, 10 deletions
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 4039d8c120b5..109f4f10d314 100644
--- 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