diff options
author | Nicolas Pitre <nico@cam.org> | 2007-11-23 16:38:54 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-11-26 14:44:02 -0500 |
commit | d28a170d5b67248d690df68d46491ee2cf6f4f6d (patch) | |
tree | 1851e342882b43435196f76873cd04bc060bcc39 /arch/arm/kernel | |
parent | b49c0f24cf6744a3f4fd09289fe7cade349dead5 (diff) |
[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/arm/kernel')
-rw-r--r-- | arch/arm/kernel/entry-armv.S | 2 |
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: | |||
453 | @ | 453 | @ |
454 | @ r0 - instruction | 454 | @ r0 - instruction |
455 | @ | 455 | @ |
456 | 1: ldrt r0, [r4] | ||
457 | adr r9, ret_from_exception | 456 | adr r9, ret_from_exception |
458 | adr lr, __und_usr_unknown | 457 | adr lr, __und_usr_unknown |
458 | 1: ldrt r0, [r4] | ||
459 | @ | 459 | @ |
460 | @ fallthrough to call_fpe | 460 | @ fallthrough to call_fpe |
461 | @ | 461 | @ |