Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91368d73 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[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: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3257545e

arch/i386/kernel/nmi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/i386/mm/fault.c

+2 −2
Original line number Diff line number Diff line
@@ -518,9 +518,9 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs, 
	}

#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);

include/asm-generic/bug.h

+2 −2
Original line number Diff line number Diff line
@@ -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)

kernel/sched.c

+2 −2
Original line number Diff line number Diff line
@@ -2873,7 +2873,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();
@@ -6074,7 +6074,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());