diff options
| author | Eric Miao <eric.miao@linaro.org> | 2011-10-22 09:32:05 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2011-10-22 09:32:05 +0800 |
| commit | 596804675e0eae9abac11e8d65bf132f77845bf3 (patch) | |
| tree | f52fb0f8d2aaf38a6fb0e729e9ad293205c1b09d /arch/arm/vfp/entry.S | |
| parent | 78b86052c5e36ba18b70f4b2ea6f518a2c9dbc1d (diff) | |
| parent | 0927679c26e461abdce8704bfb5dea7646570109 (diff) | |
Merge branch 'linaro-android-3.1-fport' of git://git.linaro.org/people/jstultz/android into lt-3.1-android
Diffstat (limited to 'arch/arm/vfp/entry.S')
| -rw-r--r-- | arch/arm/vfp/entry.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S index 4fa9903b83c..c1a97840258 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 |