---

yaml --- r: 198184 b: refs/heads/master c: 9a95e2f h: refs/heads/master v: v3
git-mirror · May 21, 2010 · 36a53c0 · 36a53c0
1 parent 937f4f3
commit 36a53c0
Show file tree

Hide file tree

Showing 5 changed files with 447 additions and 68 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d60805ad470aef52465f3dc982212f559d9f661b
+refs/heads/master: 9a95e2f1008ee433c496a81628cdde67acc8e4b1
diff --git a/trunk/arch/blackfin/include/asm/trace.h b/trunk/arch/blackfin/include/asm/trace.h
@@ -25,10 +25,10 @@ extern unsigned long trace_buff_offset;
 extern unsigned long software_trace_buff[];
 #if defined(CONFIG_DEBUG_VERBOSE)
 extern void decode_address(char *buf, unsigned long address);
-extern bool get_instruction(unsigned short *val, unsigned short *address);
+extern bool get_instruction(unsigned int *val, unsigned short *address);
 #else
-#define decode_address(buf, address)
-#define get_instruction(val, address) 0
+static inline void decode_address(char *buf, unsigned long address) { }
+static inline bool get_instruction(unsigned int *val, unsigned short *address) { return false; }
 #endif
 
 /* Trace Macros for C files */

diff --git a/trunk/arch/blackfin/kernel/dumpstack.c b/trunk/arch/blackfin/kernel/dumpstack.c
@@ -18,21 +18,14 @@
  */
 static bool is_bfin_call(unsigned short *addr)
 {
-	unsigned short opcode = 0, *ins_addr;
-	ins_addr = (unsigned short *)addr;
+	unsigned int opcode;
 
-	if (!get_instruction(&opcode, ins_addr))
+	if (!get_instruction(&opcode, addr))
 		return false;
 
 	if ((opcode >= 0x0060 && opcode <= 0x0067) ||
-	    (opcode >= 0x0070 && opcode <= 0x0077))
-		return true;
-
-	ins_addr--;
-	if (!get_instruction(&opcode, ins_addr))
-		return false;
-
-	if (opcode >= 0xE300 && opcode <= 0xE3FF)
+	    (opcode >= 0x0070 && opcode <= 0x0077) ||
+	    (opcode >= 0xE3000000 && opcode <= 0xE3FFFFFF))
 		return true;
 
 	return false;