diff options
| author | Nicolas Pitre | 2005-10-12 20:51:24 +0200 |
|---|---|---|
| committer | Russell King | 2005-10-12 20:51:24 +0200 |
| commit | 60ac133aac9e07b94f2cb6bf571bf8aef69248c3 (patch) | |
| tree | f75a44630c4cd0b63c025eee1ccc615a6ec7157e /arch/arm | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | kernel-qcow2-linux-60ac133aac9e07b94f2cb6bf571bf8aef69248c3.tar.gz kernel-qcow2-linux-60ac133aac9e07b94f2cb6bf571bf8aef69248c3.tar.xz kernel-qcow2-linux-60ac133aac9e07b94f2cb6bf571bf8aef69248c3.zip | |
[ARM] 2974/1: fix ARM710 swi bug workaround
Patch from Nicolas Pitre
Either no one is using an ARM710 with recent kernels, or all ARM710s
still in use are not afflicted by this swi bug. Nevertheless, the code
to work around the ARM710 swi bug is itself currently buggy since it
uses r8 as a pointer to S_PC while in fact it holds the spsr content
these days. Fix that, and simplify the code as well.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/entry-common.S | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 81d450ac3fab..066597f4345a 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -106,15 +106,10 @@ ENTRY(ret_from_fork) .endm .Larm700bug: - ldr r0, [sp, #S_PSR] @ Get calling cpsr - sub lr, lr, #4 - str lr, [r8] - msr spsr_cxsf, r0 ldmia sp, {r0 - lr}^ @ Get calling r0 - lr mov r0, r0 - ldr lr, [sp, #S_PC] @ Get PC add sp, sp, #S_FRAME_SIZE - movs pc, lr + subs pc, lr, #4 #else .macro arm710_bug_check, instr, temp .endm |