From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 9 Jun 2011 22:21:11 +0000 (+0100)
Subject: ARM: extend Code: line by one 16-bit quantity for Thumb instructions
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a9011580a99cd4f21546381782582bfaf9e40675;p=openwrt%2Fstaging%2Fblogic.git

ARM: extend Code: line by one 16-bit quantity for Thumb instructions

Dump out the following 16-bit instruction to the faulting instruction
in the Code: line.  This allows Thumb-2 instructions to be properly
encoded.

Tested-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index c5ead3c2c618..6807cb1e76dd 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -139,7 +139,7 @@ static void dump_instr(const char *lvl, struct pt_regs *regs)
 	fs = get_fs();
 	set_fs(KERNEL_DS);
 
-	for (i = -4; i < 1; i++) {
+	for (i = -4; i < 1 + !!thumb; i++) {
 		unsigned int val, bad;
 
 		if (thumb)