diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-04 20:20:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-04 20:20:10 +0100 |
| commit | 6d2e91bf80e4410207f01edb0962aec9213f3533 (patch) | |
| tree | d9e63711b0958748accff409596eca742a3c360b /arch/arm/mm/abort-ev6.S | |
| parent | 6298e719cf388f43b674f43799af467d3e4e5aa7 (diff) | |
| parent | dd39ecf522ba86c70809715af46e6557f6491131 (diff) | |
| download | blackbird-obmc-linux-6d2e91bf80e4410207f01edb0962aec9213f3533.tar.gz blackbird-obmc-linux-6d2e91bf80e4410207f01edb0962aec9213f3533.zip | |
Merge branch 'x86/urgent' into x86/mm
Conflicts:
arch/x86/include/asm/fixmap_64.h
Semantic merge:
arch/x86/include/asm/fixmap.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mm/abort-ev6.S')
| -rw-r--r-- | arch/arm/mm/abort-ev6.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mm/abort-ev6.S b/arch/arm/mm/abort-ev6.S index 8a7f65ba14b7..94077fbd96b7 100644 --- a/arch/arm/mm/abort-ev6.S +++ b/arch/arm/mm/abort-ev6.S @@ -23,7 +23,8 @@ ENTRY(v6_early_abort) #ifdef CONFIG_CPU_32v6K clrex #else - strex r0, r1, [sp] @ Clear the exclusive monitor + sub r1, sp, #4 @ Get unused stack location + strex r0, r1, [r1] @ Clear the exclusive monitor #endif mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r0, c6, c0, 0 @ get FAR |
