diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-02 15:19:47 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-02 15:19:47 +1100 |
| commit | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (patch) | |
| tree | e72d3f0c80d73366f8341f321c9fbb9e7f78ba6f /arch/powerpc/kernel/traps.c | |
| parent | b5ca71a58bacb5f1d563a0fe51525b6006618e82 (diff) | |
| download | linux-104dd65fef378773ec0510c788bd4b5ad6ea1121.tar.gz linux-104dd65fef378773ec0510c788bd4b5ad6ea1121.tar.bz2 linux-104dd65fef378773ec0510c788bd4b5ad6ea1121.zip | |
powerpc: clean up bug.h further
This simplifies the macros which are different between 32-bit and
64-bit. It also fixes a couple of printks on the bug->line element,
which is now a long.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/traps.c')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index bb0d00284a7e..07e5ee40b870 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -749,22 +749,22 @@ static int check_bug_trap(struct pt_regs *regs) if (bug->line & BUG_WARNING_TRAP) { /* this is a WARN_ON rather than BUG/BUG_ON */ #ifdef CONFIG_XMON - xmon_printf(KERN_ERR "Badness in %s at %s:%d\n", + xmon_printf(KERN_ERR "Badness in %s at %s:%ld\n", bug->function, bug->file, bug->line & ~BUG_WARNING_TRAP); #endif /* CONFIG_XMON */ - printk(KERN_ERR "Badness in %s at %s:%d\n", + printk(KERN_ERR "Badness in %s at %s:%ld\n", bug->function, bug->file, bug->line & ~BUG_WARNING_TRAP); dump_stack(); return 1; } #ifdef CONFIG_XMON - xmon_printf(KERN_CRIT "kernel BUG in %s at %s:%d!\n", + xmon_printf(KERN_CRIT "kernel BUG in %s at %s:%ld!\n", bug->function, bug->file, bug->line); xmon(regs); #endif /* CONFIG_XMON */ - printk(KERN_CRIT "kernel BUG in %s at %s:%d!\n", + printk(KERN_CRIT "kernel BUG in %s at %s:%ld!\n", bug->function, bug->file, bug->line); return 0; |