summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2007-11-24 00:38:54 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-11-26 22:44:02 +0300
commitd28a170d5b67248d690df68d46491ee2cf6f4f6d (patch)
tree1851e342882b43435196f76873cd04bc060bcc39 /arch
parentb49c0f24cf6744a3f4fd09289fe7cade349dead5 (diff)
downloadlinux-d28a170d5b67248d690df68d46491ee2cf6f4f6d.tar.xz
[ARM] 4665/1: fix __und_usr wrt accessing the undefined insn in user space
The ldrt fixup code expects r9 to be set. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/entry-armv.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 0d1bbea84df0..29dec080a604 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -453,9 +453,9 @@ __und_usr:
@
@ r0 - instruction
@
-1: ldrt r0, [r4]
adr r9, ret_from_exception
adr lr, __und_usr_unknown
+1: ldrt r0, [r4]
@
@ fallthrough to call_fpe
@