From a79537e3323d50f0c3363d28913dcbc855c5fd93 Mon Sep 17 00:00:00 2001
From: "George G. Davis" <gdavis@mvista.com>
Date: Tue, 26 Jun 2007 01:38:27 +0100
Subject: [PATCH] --- yaml --- r: 59247 b: refs/heads/master c:
 909d6c6c80311f800aee338e5fa528818b115951 h: refs/heads/master i:   59245:
 190096beb310c044afbf5e70c5a26ffb1cc81d2d   59243:
 9d73358e537d93400a51250a92db072bae9b5dc4   59239:
 7ad0b308344c45c0ca420bfa52286f035880adbe   59231:
 65909799530100c10cf23375dd523834b144668c v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/kernel/process.c | 8 ++++++--
 trunk/include/asm-arm/ptrace.h  | 4 ++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d7327afe809d..4e4b0d7eb2fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d20fdd58e74d4d26dc5216efaaa0f800c23dd3a
+refs/heads/master: 909d6c6c80311f800aee338e5fa528818b115951
diff --git a/trunk/arch/arm/kernel/process.c b/trunk/arch/arm/kernel/process.c
index 842361777d4e..93b7f8e22dcc 100644
--- a/trunk/arch/arm/kernel/process.c
+++ b/trunk/arch/arm/kernel/process.c
@@ -44,6 +44,10 @@ static const char *processor_modes[] = {
   "UK8_32" , "UK9_32" , "UK10_32", "UND_32" , "UK12_32", "UK13_32", "UK14_32", "SYS_32"
 };
 
+static const char *isa_modes[] = {
+  "ARM" , "Thumb" , "Jazelle", "ThumbEE"
+};
+
 extern void setup_mm_for_reboot(char mode);
 
 static volatile int hlt_counter;
@@ -230,11 +234,11 @@ void __show_regs(struct pt_regs *regs)
 	buf[3] = flags & PSR_V_BIT ? 'V' : 'v';
 	buf[4] = '\0';
 
-	printk("Flags: %s  IRQs o%s  FIQs o%s  Mode %s%s  Segment %s\n",
+	printk("Flags: %s  IRQs o%s  FIQs o%s  Mode %s  ISA %s  Segment %s\n",
 		buf, interrupts_enabled(regs) ? "n" : "ff",
 		fast_interrupts_enabled(regs) ? "n" : "ff",
 		processor_modes[processor_mode(regs)],
-		thumb_mode(regs) ? " (T)" : "",
+		isa_modes[isa_mode(regs)],
 		get_fs() == get_ds() ? "kernel" : "user");
 #ifdef CONFIG_CPU_CP15
 	{
diff --git a/trunk/include/asm-arm/ptrace.h b/trunk/include/asm-arm/ptrace.h
index ee3d93c281d8..ff038b65f370 100644
--- a/trunk/include/asm-arm/ptrace.h
+++ b/trunk/include/asm-arm/ptrace.h
@@ -103,6 +103,10 @@ struct pt_regs {
 #define thumb_mode(regs) (0)
 #endif
 
+#define isa_mode(regs) \
+	((((regs)->ARM_cpsr & PSR_J_BIT) >> 23) | \
+	 (((regs)->ARM_cpsr & PSR_T_BIT) >> 5))
+
 #define processor_mode(regs) \
 	((regs)->ARM_cpsr & MODE_MASK)