diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ppc/kernel/traps.c | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/traps.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c index 961ede87be7..82e4d70e6db 100644 --- a/arch/ppc/kernel/traps.c +++ b/arch/ppc/kernel/traps.c | |||
@@ -575,7 +575,7 @@ extern struct bug_entry __start___bug_table[], __stop___bug_table[]; | |||
575 | #define module_find_bug(x) NULL | 575 | #define module_find_bug(x) NULL |
576 | #endif | 576 | #endif |
577 | 577 | ||
578 | static struct bug_entry *find_bug(unsigned long bugaddr) | 578 | struct bug_entry *find_bug(unsigned long bugaddr) |
579 | { | 579 | { |
580 | struct bug_entry *bug; | 580 | struct bug_entry *bug; |
581 | 581 | ||
diff --git a/arch/ppc64/kernel/traps.c b/arch/ppc64/kernel/traps.c index 7467ae508e6..5c4647b2c5f 100644 --- a/arch/ppc64/kernel/traps.c +++ b/arch/ppc64/kernel/traps.c | |||
@@ -390,12 +390,12 @@ check_bug_trap(struct pt_regs *regs) | |||
390 | /* this is a WARN_ON rather than BUG/BUG_ON */ | 390 | /* this is a WARN_ON rather than BUG/BUG_ON */ |
391 | printk(KERN_ERR "Badness in %s at %s:%d\n", | 391 | printk(KERN_ERR "Badness in %s at %s:%d\n", |
392 | bug->function, bug->file, | 392 | bug->function, bug->file, |
393 | (unsigned int)bug->line & ~BUG_WARNING_TRAP); | 393 | bug->line & ~BUG_WARNING_TRAP); |
394 | show_stack(current, (void *)regs->gpr[1]); | 394 | show_stack(current, (void *)regs->gpr[1]); |
395 | return 1; | 395 | return 1; |
396 | } | 396 | } |
397 | printk(KERN_CRIT "kernel BUG in %s at %s:%d!\n", | 397 | printk(KERN_CRIT "kernel BUG in %s at %s:%d!\n", |
398 | bug->function, bug->file, (unsigned int)bug->line); | 398 | bug->function, bug->file, bug->line); |
399 | return 0; | 399 | return 0; |
400 | } | 400 | } |
401 | 401 | ||