diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:33:32 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:33:32 -0500 |
commit | 404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34 (patch) | |
tree | 99119edc53fdca73ed7586829b8ee736e09440b3 /arch/arm/kernel/entry-armv.S | |
parent | 28cdac6690cb113856293bf79b40de33dbd8f974 (diff) | |
parent | 1051b9f0f9eab8091fe3bf98320741adf36b4cfa (diff) |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/clock.h
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
-rw-r--r-- | arch/arm/kernel/entry-armv.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 27f64489c1c..2b46fea36c9 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S | |||
@@ -178,6 +178,7 @@ __dabt_svc: | |||
178 | @ | 178 | @ |
179 | @ set desired IRQ state, then call main handler | 179 | @ set desired IRQ state, then call main handler |
180 | @ | 180 | @ |
181 | debug_entry r1 | ||
181 | msr cpsr_c, r9 | 182 | msr cpsr_c, r9 |
182 | mov r2, sp | 183 | mov r2, sp |
183 | bl do_DataAbort | 184 | bl do_DataAbort |
@@ -304,6 +305,7 @@ __pabt_svc: | |||
304 | #else | 305 | #else |
305 | bl CPU_PABORT_HANDLER | 306 | bl CPU_PABORT_HANDLER |
306 | #endif | 307 | #endif |
308 | debug_entry r1 | ||
307 | msr cpsr_c, r9 @ Maybe enable interrupts | 309 | msr cpsr_c, r9 @ Maybe enable interrupts |
308 | mov r2, sp @ regs | 310 | mov r2, sp @ regs |
309 | bl do_PrefetchAbort @ call abort handler | 311 | bl do_PrefetchAbort @ call abort handler |
@@ -419,6 +421,7 @@ __dabt_usr: | |||
419 | @ | 421 | @ |
420 | @ IRQs on, then call the main handler | 422 | @ IRQs on, then call the main handler |
421 | @ | 423 | @ |
424 | debug_entry r1 | ||
422 | enable_irq | 425 | enable_irq |
423 | mov r2, sp | 426 | mov r2, sp |
424 | adr lr, BSYM(ret_from_exception) | 427 | adr lr, BSYM(ret_from_exception) |
@@ -683,6 +686,7 @@ __pabt_usr: | |||
683 | #else | 686 | #else |
684 | bl CPU_PABORT_HANDLER | 687 | bl CPU_PABORT_HANDLER |
685 | #endif | 688 | #endif |
689 | debug_entry r1 | ||
686 | enable_irq @ Enable interrupts | 690 | enable_irq @ Enable interrupts |
687 | mov r2, sp @ regs | 691 | mov r2, sp @ regs |
688 | bl do_PrefetchAbort @ call abort handler | 692 | bl do_PrefetchAbort @ call abort handler |