aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/kernel/traps.c
diff options
context:
space:
mode:
authorRobin Getz <rgetz@blackfin.uclinux.org>2008-10-08 04:29:01 -0400
committerBryan Wu <cooloney@kernel.org>2008-10-08 04:29:01 -0400
commit7d98c881eed9e19767bc77ffd650d0041b4f41ec (patch)
treeff37496962bbe0c741b859206c471ac429a803db /arch/blackfin/kernel/traps.c
parent74c04503d777b5d1f8f2e38852df4f1a6c82fc7b (diff)
Blackfin arch: Make sure we protect except 2 properly, and print out memory properly
Signed-off-by: Robin Getz <rgetz@blackfin.uclinux.org> Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/kernel/traps.c')
-rw-r--r--arch/blackfin/kernel/traps.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index be5ae7fabc5f..0112ba407f63 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -317,6 +317,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
317 * If we got here, it is most likely that someone was trying to use a 317 * If we got here, it is most likely that someone was trying to use a
318 * custom exception handler, and it is not actually installed properly 318 * custom exception handler, and it is not actually installed properly
319 */ 319 */
320 case VEC_EXCPT02:
320 case VEC_EXCPT04 ... VEC_EXCPT15: 321 case VEC_EXCPT04 ... VEC_EXCPT15:
321 info.si_code = ILL_ILLPARAOP; 322 info.si_code = ILL_ILLPARAOP;
322 sig = SIGILL; 323 sig = SIGILL;
@@ -968,7 +969,7 @@ void dump_bfin_mem(struct pt_regs *fp)
968 if (!((unsigned long)addr & 0xF)) 969 if (!((unsigned long)addr & 0xF))
969 printk("\n" KERN_NOTICE "0x%p: ", addr); 970 printk("\n" KERN_NOTICE "0x%p: ", addr);
970 971
971 if (get_instruction(&val, addr)) { 972 if (!get_instruction(&val, addr)) {
972 val = 0; 973 val = 0;
973 sprintf(buf, "????"); 974 sprintf(buf, "????");
974 } else 975 } else