x86: print message if nmi_watchdog=2 cannot be enabled

[sfrench/cifs-2.6.git] / arch / x86 / kernel / cpu / perfctr-watchdog.c

diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c
index 9b838324b818f73e6aabea5dbca893c790827c7d..b943e10ad81438aa528ee1c7dad5f7a528488a38 100644 (file)
--- a/arch/x86/kernel/cpu/perfctr-watchdog.c
+++ b/arch/x86/kernel/cpu/perfctr-watchdog.c
@@ -652,9 +652,6 @@ static void probe_nmi_watchdog(void)
                        wd_ops = &p6_wd_ops;
                        break;
                case 15:
-                       if (boot_cpu_data.x86_model > 0x4)
-                               return;
-
                        wd_ops = &p4_wd_ops;
                        break;
                default:
@@ -670,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