diff options
| author | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2011-11-24 17:12:43 -0700 |
|---|---|---|
| committer | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2011-11-24 17:12:43 -0700 |
| commit | 3201e765069ff7dff39e135374f1938104cb58b1 (patch) | |
| tree | 579cf40fbe017cc39b3b0e0fe5ad5e3adf6ee6cf /arch/arm/vfp/entry.S | |
| parent | f94904d17571ad46b48409f2a9724eddffcdcd52 (diff) | |
| parent | f5968c8833f0985b76d38593892acd6558bab149 (diff) | |
:Merge commit 'linux-linaro-3.0-2011.07-1-android-1' into igloocommunity.org#igloo-kernel#linux-integration-3.0-ux500
Conflicts:
arch/arm/common/Makefile
drivers/gpu/Makefile
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mmc/card/block.c
drivers/mmc/core/core.c
drivers/usb/gadget/f_rndis.c
drivers/video/Kconfig
include/linux/mmc/host.h
include/net/bluetooth/hci.h
include/net/bluetooth/hci_core.h
include/net/bluetooth/sco.h
kernel/printk.c
net/bluetooth/hci_conn.c
net/bluetooth/hci_event.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/bluetooth/sco.c
Change-Id: Iad0d95c2345676e51a4990697896ded690b6bb3c
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 |