diff options
| author | Rabin Vincent <rabin@rab.in> | 2012-02-15 16:01:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-29 16:33:44 -0800 |
| commit | bbb8ae42eb210ba2bdff67450f3737e10cb042f3 (patch) | |
| tree | 6119bcda439aaafdb2475a82345f39e3898654e3 /arch/arm/include | |
| parent | ad15d5c6dc9f1272fe1dde3de87ab775f65a6d77 (diff) | |
| download | kernel_samsung_smdk4412-bbb8ae42eb210ba2bdff67450f3737e10cb042f3.zip kernel_samsung_smdk4412-bbb8ae42eb210ba2bdff67450f3737e10cb042f3.tar.gz kernel_samsung_smdk4412-bbb8ae42eb210ba2bdff67450f3737e10cb042f3.tar.bz2 | |
ARM: 7325/1: fix v7 boot with lockdep enabled
commit 8e43a905dd574f54c5715d978318290ceafbe275 upstream.
Bootup with lockdep enabled has been broken on v7 since b46c0f74657d
("ARM: 7321/1: cache-v7: Disable preemption when reading CCSIDR").
This is because v7_setup (which is called very early during boot) calls
v7_flush_dcache_all, and the save_and_disable_irqs added by that patch
ends up attempting to call into lockdep C code (trace_hardirqs_off())
when we are in no position to execute it (no stack, MMU off).
Fix this by using a notrace variant of save_and_disable_irqs. The code
already uses the notrace variant of restore_irqs.
Reviewed-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/assembler.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 65c3f24..4e25f18 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -137,6 +137,11 @@ disable_irq .endm + .macro save_and_disable_irqs_notrace, oldcpsr + mrs \oldcpsr, cpsr + disable_irq_notrace + .endm + /* * Restore interrupt state previously stored in a register. We don't * guarantee that this will preserve the flags. |