Title: [8471] trunk/arch/blackfin: Update per Mike's comments
- Revision
- 8471
- Author
- rgetz
- Date
- 2010-03-16 15:29:59 -0400 (Tue, 16 Mar 2010)
Log Message
Update per Mike's comments
Modified Paths
Diff
Modified: trunk/arch/blackfin/include/asm/pseudo_instructions.h (8470 => 8471)
--- trunk/arch/blackfin/include/asm/pseudo_instructions.h 2010-03-16 14:40:17 UTC (rev 8470)
+++ trunk/arch/blackfin/include/asm/pseudo_instructions.h 2010-03-16 19:29:59 UTC (rev 8471)
@@ -1 +1,17 @@
+/*
+ * header file for pseudo instructions
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef _BLACKFIN_PSEUDO_
+#define _BLACKFIN_PSEUDO_
+
+#include <linux/types.h>
+#include <asm/ptrace.h>
+
extern bool execute_pseudodbg_assert(struct pt_regs *fp, unsigned int opcode);
+
+#endif
Modified: trunk/arch/blackfin/kernel/pseudodgba.c (8470 => 8471)
--- trunk/arch/blackfin/kernel/pseudodgba.c 2010-03-16 14:40:17 UTC (rev 8470)
+++ trunk/arch/blackfin/kernel/pseudodgba.c 2010-03-16 19:29:59 UTC (rev 8471)
@@ -1,10 +1,12 @@
/* The fake debug assert instructions
*
- * Copyright 2004-2009 Analog Devices Inc.
+ * Copyright 2010 Analog Devices Inc.
*
* Licensed under the GPL-2 or later
*/
+#include <linux/types.h>
+#include <linux/kernel.h>
#include <linux/ptrace.h>
#define PseudoDbg_Assert_opcode 0xf0000000
@@ -54,5 +56,6 @@
}
}
+ fp->pc += 4;
return true;
}
Modified: trunk/arch/blackfin/kernel/traps.c (8470 => 8471)
--- trunk/arch/blackfin/kernel/traps.c 2010-03-16 14:40:17 UTC (rev 8470)
+++ trunk/arch/blackfin/kernel/traps.c 2010-03-16 19:29:59 UTC (rev 8471)
@@ -14,9 +14,7 @@
#include <linux/irq.h>
#include <asm/trace.h>
#include <asm/fixed_code.h>
-#ifdef CONFIG_BFIN_PSEUDO_DBGA
#include <asm/pseudo_instructions.h>
-#endif
#ifdef CONFIG_KGDB
# include <linux/kgdb.h>
@@ -211,10 +209,8 @@
* Don't support these instructions inside the kernel
*/
if (!kernel_mode_regs(fp) && get_instruction(&opcode, (unsigned short *)fp->pc)) {
- if (execute_pseudodbg_assert(fp, opcode)) {
- fp->pc += 4;
+ if (execute_pseudodbg_assert(fp, opcode))
goto traps_done;
- }
}
#endif
info.si_code = ILL_ILLOPC;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
