aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/entry-armv.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-armv.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-armv.S')
-rw-r--r--arch/arm/kernel/entry-armv.S12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 37723bfb96a6..fc1428905472 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -118,7 +118,7 @@ __dabt_svc:
118 @ 118 @
119 @ IRQs off again before pulling preserved data off the stack 119 @ IRQs off again before pulling preserved data off the stack
120 @ 120 @
121 disable_irq r0 121 disable_irq
122 122
123 @ 123 @
124 @ restore SPSR and restart the instruction 124 @ restore SPSR and restart the instruction
@@ -198,7 +198,7 @@ __und_svc:
198 @ 198 @
199 @ IRQs off again before pulling preserved data off the stack 199 @ IRQs off again before pulling preserved data off the stack
200 @ 200 @
2011: disable_irq r0 2011: disable_irq
202 202
203 @ 203 @
204 @ restore SPSR and restart the instruction 204 @ restore SPSR and restart the instruction
@@ -232,7 +232,7 @@ __pabt_svc:
232 @ 232 @
233 @ IRQs off again before pulling preserved data off the stack 233 @ IRQs off again before pulling preserved data off the stack
234 @ 234 @
235 disable_irq r0 235 disable_irq
236 236
237 @ 237 @
238 @ restore SPSR and restart the instruction 238 @ restore SPSR and restart the instruction
@@ -316,7 +316,7 @@ __dabt_usr:
316 @ 316 @
317 @ IRQs on, then call the main handler 317 @ IRQs on, then call the main handler
318 @ 318 @
319 enable_irq r2 319 enable_irq
320 mov r2, sp 320 mov r2, sp
321 adr lr, ret_from_exception 321 adr lr, ret_from_exception
322 b do_DataAbort 322 b do_DataAbort
@@ -418,7 +418,7 @@ call_fpe:
418 movcss r7, r5, lsr #(TIF_USING_IWMMXT + 1) 418 movcss r7, r5, lsr #(TIF_USING_IWMMXT + 1)
419 bcs iwmmxt_task_enable 419 bcs iwmmxt_task_enable
420#endif 420#endif
421 enable_irq r7 421 enable_irq
422 add pc, pc, r8, lsr #6 422 add pc, pc, r8, lsr #6
423 mov r0, r0 423 mov r0, r0
424 424
@@ -472,7 +472,7 @@ fpundefinstr:
472__pabt_usr: 472__pabt_usr:
473 usr_entry abt 473 usr_entry abt
474 474
475 enable_irq r0 @ Enable interrupts 475 enable_irq @ Enable interrupts
476 mov r0, r2 @ address (pc) 476 mov r0, r2 @ address (pc)
477 mov r1, sp @ regs 477 mov r1, sp @ regs
478 bl do_PrefetchAbort @ call abort handler 478 bl do_PrefetchAbort @ call abort handler