Skip to content

Commit

Permalink
Blackfin arch: fixup warnings with the new cplb saved values
Browse files Browse the repository at this point in the history 
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
  • Loading branch information
Mike Frysinger authored and Bryan Wu committed Jun 3, 2008
1 parent 1feaa51 commit bd628bd
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions arch/blackfin/kernel/traps.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void __init trap_init(void)
CSYNC();
}

void *saved_icplb_fault_addr, *saved_dcplb_fault_addr;
unsigned long saved_icplb_fault_addr, saved_dcplb_fault_addr;

int kstack_depth_to_print = 48;

Expand Down Expand Up @@ -366,7 +366,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
info.si_code = ILL_CPLB_MULHIT;
sig = SIGSEGV;
#ifdef CONFIG_DEBUG_HUNT_FOR_ZERO
if (saved_dcplb_fault_addr < (void *)FIXED_CODE_START)
if (saved_dcplb_fault_addr < FIXED_CODE_START)
printk(KERN_NOTICE "NULL pointer access\n");
else
#endif
Expand Down Expand Up @@ -421,7 +421,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
info.si_code = ILL_CPLB_MULHIT;
sig = SIGSEGV;
#ifdef CONFIG_DEBUG_HUNT_FOR_ZERO
if (saved_icplb_fault_addr < (void *)FIXED_CODE_START)
if (saved_icplb_fault_addr < FIXED_CODE_START)
printk(KERN_NOTICE "Jump to NULL address\n");
else
#endif
Expand Down Expand Up @@ -939,8 +939,6 @@ void panic_cplb_error(int cplb_panic, struct pt_regs *fp)

oops_in_progress = 1;

printk(KERN_EMERG "DCPLB_FAULT_ADDR=%p\n", saved_dcplb_fault_addr);
printk(KERN_EMERG "ICPLB_FAULT_ADDR=%p\n", saved_icplb_fault_addr);
dump_bfin_process(fp);
dump_bfin_mem(fp);
show_regs(fp);
Expand Down

0 comments on commit bd628bd

Please sign in to comment.