[PATCH] make bug messages more consistent

Consolidate all kernel bug printouts to begin with the "BUG: " string.
Makes it easier to find them in large bootup logs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index be87c5e2ee95..1db34effdd8d 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -543,7 +543,7 @@ void nmi_watchdog_tick (struct pt_regs * 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");
         } else {
                 last_irq_sums[cpu] = sum;
                 alert_counter[cpu] = 0;
diff --git a/arch/i386/mm/fault.c b/arch/i386/mm/fault.c
index bbb24af5d860..47a3b72ec7b6 100644
--- a/arch/i386/mm/fault.c
+++ b/arch/i386/mm/fault.c
@@ -518,9 +518,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);