diff options
| author | Colin Cross <ccross@android.com> | 2011-01-14 17:32:17 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-01-14 17:32:17 -0800 |
| commit | 61327f2aa0b265952ee8834c920cbbf80cace95e (patch) | |
| tree | 8496177b27cb619538ffd1f67733d9312cc5ab6e /arch/arm/kernel | |
| parent | da7187758bea309525069c6110d80520cb6635ab (diff) | |
| parent | 255914b9277591b2afc8f5f0076ddcf379e41273 (diff) | |
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index bb8e93a76407..e572d24d018d 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -506,7 +506,8 @@ __und_usr: blo __und_usr_unknown 3: ldrht r0, [r4] add r2, r2, #2 @ r2 is PC + 2, make it PC + 4 - orr r0, r0, r5, lsl #16 + str r2, [sp, #S_PC] @ it's a 2x16bit instr, update + orr r0, r0, r5, lsl #16 @ regs->ARM_pc #else b __und_usr_unknown #endif |