From: Ingo Molnar 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 Signed-off-by: Andrew Morton --- arch/i386/kernel/nmi.c | 2 +- arch/i386/mm/fault.c | 4 ++-- include/asm-generic/bug.h | 4 ++-- kernel/sched.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff -puN include/asm-generic/bug.h~make-bug-messages-more-consistent include/asm-generic/bug.h --- devel/include/asm-generic/bug.h~make-bug-messages-more-consistent 2006-02-23 19:41:15.000000000 -0800 +++ devel-akpm/include/asm-generic/bug.h 2006-02-23 19:41:15.000000000 -0800 @@ -7,7 +7,7 @@ #ifdef CONFIG_BUG #ifndef HAVE_ARCH_BUG #define BUG() do { \ - printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ + printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \ panic("BUG!"); \ } while (0) #endif @@ -19,7 +19,7 @@ #ifndef HAVE_ARCH_WARN_ON #define WARN_ON(condition) do { \ if (unlikely((condition)!=0)) { \ - printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \ + printk("BUG: warning at %s:%d/%s()\n", __FILE__, __LINE__, __FUNCTION__); \ dump_stack(); \ } \ } while (0) diff -puN kernel/sched.c~make-bug-messages-more-consistent kernel/sched.c --- devel/kernel/sched.c~make-bug-messages-more-consistent 2006-02-23 19:41:15.000000000 -0800 +++ devel-akpm/kernel/sched.c 2006-02-23 19:41:15.000000000 -0800 @@ -2882,7 +2882,7 @@ asmlinkage void __sched schedule(void) */ if (likely(!current->exit_state)) { if (unlikely(in_atomic())) { - printk(KERN_ERR "scheduling while atomic: " + printk(KERN_ERR "BUG: scheduling while atomic: " "%s/0x%08x/%d\n", current->comm, preempt_count(), current->pid); dump_stack(); @@ -6079,7 +6079,7 @@ void __might_sleep(char *file, int line) if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy) return; prev_jiffy = jiffies; - printk(KERN_ERR "Debug: sleeping function called from invalid" + printk(KERN_ERR "BUG: sleeping function called from invalid" " context at %s:%d\n", file, line); printk("in_atomic():%d, irqs_disabled():%d\n", in_atomic(), irqs_disabled()); diff -puN arch/i386/kernel/nmi.c~make-bug-messages-more-consistent arch/i386/kernel/nmi.c --- devel/arch/i386/kernel/nmi.c~make-bug-messages-more-consistent 2006-02-23 19:41:15.000000000 -0800 +++ devel-akpm/arch/i386/kernel/nmi.c 2006-02-23 19:41:15.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 arch/i386/mm/fault.c --- devel/arch/i386/mm/fault.c~make-bug-messages-more-consistent 2006-02-23 19:41:15.000000000 -0800 +++ devel-akpm/arch/i386/mm/fault.c 2006-02-23 19:41:15.000000000 -0800 @@ -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); _