Commit 5651f7f4 authored Feb 09, 2011 by Don Zickus Committed by Ingo Molnar Feb 10, 2011

watchdog, nmi: Lower the severity of error messages



During boot if the hardlockup detector fails to initialize, it
complains very loudly.  Some failures should be expected under
certain situations, ie no lapics, or resource in-use.  Tone
those error messages down a bit.  Keep the rest at a high level.

Reported-by: Paul Bolle <pebolle@tiscali.nl>
Tested-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <1297278153-21111-1-git-send-email-dzickus@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 100b33c8

kernel/watchdog.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -363,8 +363,14 @@ static int watchdog_nmi_enable(int cpu)
		goto out_save;
		}

		printk(KERN_ERR "NMI watchdog disabled for cpu%i: unable to create perf event: %ld\n",
		cpu, PTR_ERR(event));

		/* vary the KERN level based on the returned errno */
		if (PTR_ERR(event) == -EOPNOTSUPP)
		printk(KERN_INFO "NMI watchdog disabled (cpu%i): not supported (no LAPIC?)\n", cpu);
		else if (PTR_ERR(event) == -ENOENT)
		printk(KERN_WARNING "NMI watchdog disabled (cpu%i): hardware events not enabled\n", cpu);
		else
		printk(KERN_ERR "NMI watchdog disabled (cpu%i): unable to create perf event: %ld\n", cpu, PTR_ERR(event));
		return PTR_ERR(event);

		/* success path */