From: Ingo Molnar Mark two more common bug-printouts with the "BUG: " prefix. Makes them easier to find in serial log output. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton --- arch/i386/kernel/nmi.c | 2 +- arch/i386/mm/fault.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff -puN arch/i386/kernel/nmi.c~make-bug-messages-more-consistent-update arch/i386/kernel/nmi.c --- devel/arch/i386/kernel/nmi.c~make-bug-messages-more-consistent-update 2006-01-19 01:09:52.000000000 -0800 +++ devel-akpm/arch/i386/kernel/nmi.c 2006-01-19 01:12:43.000000000 -0800 @@ -543,7 +543,7 @@ void nmi_watchdog_tick (struct pt_regs * /* * die_nmi will return ONLY if NOTIFY_STOP happens.. */ - die_nmi(regs, "NMI Watchdog detected LOCKUP"); + die_nmi(regs, "BUG: NMI Watchdog detected LOCKUP"); last_irq_sums[cpu] = sum; alert_counter[cpu] = 0; diff -puN arch/i386/mm/fault.c~make-bug-messages-more-consistent-update arch/i386/mm/fault.c --- devel/arch/i386/mm/fault.c~make-bug-messages-more-consistent-update 2006-01-19 01:09:52.000000000 -0800 +++ devel-akpm/arch/i386/mm/fault.c 2006-01-19 01:09:52.000000000 -0800 @@ -449,9 +449,9 @@ no_context: } #endif if (address < PAGE_SIZE) - printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference"); + printk(KERN_ALERT "BUG: unable to handle kernel NULL pointer dereference"); else - printk(KERN_ALERT "Unable to handle kernel paging request"); + printk(KERN_ALERT "BUG: unable to handle kernel paging request"); printk(" at virtual address %08lx\n",address); printk(KERN_ALERT " printing eip:\n"); printk("%08lx\n", regs->eip); _