aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/vfp
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-01-27 15:46:20 -0800
committerColin Cross <ccross@android.com>2011-06-14 09:09:51 -0700
commit082fec5ea3d328ceb86a9590c5e47efedc5ea45c (patch)
treef898a50982edffd1e75a78a3e92408d8ebbf95ba /arch/arm/vfp
parentd20e6ae8aceb712a3c74263f17c28ca63bb2a677 (diff)
downloadkernel_samsung_espresso10-082fec5ea3d328ceb86a9590c5e47efedc5ea45c.zip
kernel_samsung_espresso10-082fec5ea3d328ceb86a9590c5e47efedc5ea45c.tar.gz
kernel_samsung_espresso10-082fec5ea3d328ceb86a9590c5e47efedc5ea45c.tar.bz2
ARM: vfp: Move exception address fixup into vfphw.S
If the PC on the stack is updated in entry-armv.S, do_undefinstr can get called after the fixup. do_undefinstr does its own fixup, and doing both causes the PC to point to half way through an instruction. Instead, do the fixup in do_vfp, where only the vfp code can get called. Change-Id: I6d966887adc8ed58d88bfe0cb3c0ba29213be488 Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'arch/arm/vfp')
-rw-r--r--arch/arm/vfp/entry.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S
index 4fa9903..c1a9784 100644
--- a/arch/arm/vfp/entry.S
+++ b/arch/arm/vfp/entry.S
@@ -10,7 +10,7 @@
*
* Basic entry code, called from the kernel's undefined instruction trap.
* r0 = faulted instruction
- * r5 = faulted PC+4
+ * r2 = faulted PC+4
* r9 = successful return
* r10 = thread_info structure
* lr = failure return
@@ -26,6 +26,7 @@ ENTRY(do_vfp)
str r11, [r10, #TI_PREEMPT]
#endif
enable_irq
+ str r2, [sp, #S_PC] @ update regs->ARM_pc for Thumb 2 case
ldr r4, .LCvfp
ldr r11, [r10, #TI_CPU] @ CPU number
add r10, r10, #TI_VFPSTATE @ r10 = workspace