diff options
Diffstat (limited to 'arch/ppc/kernel/traps.c')
| -rw-r--r-- | arch/ppc/kernel/traps.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c index f265b81e7008..16adde6b429d 100644 --- a/arch/ppc/kernel/traps.c +++ b/arch/ppc/kernel/traps.c | |||
| @@ -606,22 +606,22 @@ int check_bug_trap(struct pt_regs *regs) | |||
| 606 | if (bug->line & BUG_WARNING_TRAP) { | 606 | if (bug->line & BUG_WARNING_TRAP) { |
| 607 | /* this is a WARN_ON rather than BUG/BUG_ON */ | 607 | /* this is a WARN_ON rather than BUG/BUG_ON */ |
| 608 | #ifdef CONFIG_XMON | 608 | #ifdef CONFIG_XMON |
| 609 | xmon_printf(KERN_ERR "Badness in %s at %s:%d\n", | 609 | xmon_printf(KERN_ERR "Badness in %s at %s:%ld\n", |
| 610 | bug->function, bug->file, | 610 | bug->function, bug->file, |
| 611 | bug->line & ~BUG_WARNING_TRAP); | 611 | bug->line & ~BUG_WARNING_TRAP); |
| 612 | #endif /* CONFIG_XMON */ | 612 | #endif /* CONFIG_XMON */ |
| 613 | printk(KERN_ERR "Badness in %s at %s:%d\n", | 613 | printk(KERN_ERR "Badness in %s at %s:%ld\n", |
| 614 | bug->function, bug->file, | 614 | bug->function, bug->file, |
| 615 | bug->line & ~BUG_WARNING_TRAP); | 615 | bug->line & ~BUG_WARNING_TRAP); |
| 616 | dump_stack(); | 616 | dump_stack(); |
| 617 | return 1; | 617 | return 1; |
| 618 | } | 618 | } |
| 619 | #ifdef CONFIG_XMON | 619 | #ifdef CONFIG_XMON |
| 620 | xmon_printf(KERN_CRIT "kernel BUG in %s at %s:%d!\n", | 620 | xmon_printf(KERN_CRIT "kernel BUG in %s at %s:%ld!\n", |
| 621 | bug->function, bug->file, bug->line); | 621 | bug->function, bug->file, bug->line); |
| 622 | xmon(regs); | 622 | xmon(regs); |
| 623 | #endif /* CONFIG_XMON */ | 623 | #endif /* CONFIG_XMON */ |
| 624 | printk(KERN_CRIT "kernel BUG in %s at %s:%d!\n", | 624 | printk(KERN_CRIT "kernel BUG in %s at %s:%ld!\n", |
| 625 | bug->function, bug->file, bug->line); | 625 | bug->function, bug->file, bug->line); |
| 626 | 626 | ||
| 627 | return 0; | 627 | return 0; |
