aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/entry-common.S
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-04-26 10:18:26 -0400
committerRussell King <rmk@dyn-67.arm.linux.org.uk>2005-04-26 10:18:26 -0400
commit1ec42c0c97186fadc48810ccaf2dc573cd957ea1 (patch)
tree5476806ed2a9a37409a01b638c9cd62d0ca966a0 /arch/arm/kernel/entry-common.S
parent7933523dc75823342dbd70a27760a82a5302baf4 (diff)
[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-common.S')
-rw-r--r--arch/arm/kernel/entry-common.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 53a7e0dea44d..0cd9f7bcaad7 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -30,7 +30,7 @@
30 * stack. 30 * stack.
31 */ 31 */
32ret_fast_syscall: 32ret_fast_syscall:
33 disable_irq r1 @ disable interrupts 33 disable_irq @ disable interrupts
34 ldr r1, [tsk, #TI_FLAGS] 34 ldr r1, [tsk, #TI_FLAGS]
35 tst r1, #_TIF_WORK_MASK 35 tst r1, #_TIF_WORK_MASK
36 bne fast_work_pending 36 bne fast_work_pending
@@ -49,7 +49,7 @@ work_pending:
49 mov r0, sp @ 'regs' 49 mov r0, sp @ 'regs'
50 mov r2, why @ 'syscall' 50 mov r2, why @ 'syscall'
51 bl do_notify_resume 51 bl do_notify_resume
52 disable_irq r1 @ disable interrupts 52 disable_irq @ disable interrupts
53 b no_work_pending 53 b no_work_pending
54 54
55work_resched: 55work_resched:
@@ -59,7 +59,7 @@ work_resched:
59 */ 59 */
60ENTRY(ret_to_user) 60ENTRY(ret_to_user)
61ret_slow_syscall: 61ret_slow_syscall:
62 disable_irq r1 @ disable interrupts 62 disable_irq @ disable interrupts
63 ldr r1, [tsk, #TI_FLAGS] 63 ldr r1, [tsk, #TI_FLAGS]
64 tst r1, #_TIF_WORK_MASK 64 tst r1, #_TIF_WORK_MASK
65 bne work_pending 65 bne work_pending
@@ -126,7 +126,7 @@ ENTRY(vector_swi)
126 ldr ip, [ip] 126 ldr ip, [ip]
127 mcr p15, 0, ip, c1, c0 @ update control register 127 mcr p15, 0, ip, c1, c0 @ update control register
128#endif 128#endif
129 enable_irq ip 129 enable_irq
130 130
131 str r4, [sp, #-S_OFF]! @ push fifth arg 131 str r4, [sp, #-S_OFF]! @ push fifth arg
132 132