aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-03-27 23:39:42 +0100
committerIngo Molnar <mingo@elte.hu>2008-04-04 18:36:45 +0200
commit9c9b81f77330ddc003a2de2f35fa6a20410c1a62 (patch)
tree9c96b2827aea1cd44770330ea28ff5bf65077f8e /arch/x86
parentx86: fix nmi_watchdog=2 on Pentium-D CPUs (diff)
downloadlinux-dev-9c9b81f77330ddc003a2de2f35fa6a20410c1a62.tar.xz
linux-dev-9c9b81f77330ddc003a2de2f35fa6a20410c1a62.zip
x86: print message if nmi_watchdog=2 cannot be enabled
right now if there's no CPU support for nmi_watchdog=2 we'll just refuse it silently. print a useful warning. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/cpu/perfctr-watchdog.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c
index 19a359472ae1..b943e10ad814 100644
--- a/arch/x86/kernel/cpu/perfctr-watchdog.c
+++ b/arch/x86/kernel/cpu/perfctr-watchdog.c
@@ -667,8 +667,10 @@ int lapic_watchdog_init(unsigned nmi_hz)
{
if (!wd_ops) {
probe_nmi_watchdog();
- if (!wd_ops)
+ if (!wd_ops) {
+ printk(KERN_INFO "NMI watchdog: CPU not supported\n");
return -1;
+ }
if (!wd_ops->reserve()) {
printk(KERN_ERR