From: Nicolas Pitre <nico@cam.org>
Date: Fri, 23 Nov 2007 21:38:54 +0000 (+0100)
Subject: [ARM] 4665/1: fix __und_usr wrt accessing the undefined insn in user space
X-Git-Tag: firefly_0821_release~24186^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d28a170d5b67248d690df68d46491ee2cf6f4f6d;p=firefly-linux-kernel-4.4.55.git

[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>
---

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
 	@