diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-12 02:24:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-12 02:24:52 +0100 |
| commit | 40262a71536d0b4a7486b279fa39463cfffabcc2 (patch) | |
| tree | 2a63d79f17dff257b8ac160f0138bdb00f6e4747 /kernel | |
| parent | 3e86858133c632060b290985837a11dbe2e0cc0e (diff) | |
| parent | 0849327d13a0bd7f6512b7c21f4b3e79efb2076d (diff) | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/watchdog.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index f37f974aa81..18bb15776c5 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -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 */ |