ACPI: Reevaluate whether the T-state is supported or not after cpu is online/offline

[~andy/linux] / kernel / watchdog.c

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 6e3c41a4024c1cc66be01218e2c37498498f2469..5b082156cd2146fcf0971568d8eb28cb371b3627 100644 (file)
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -364,7 +364,8 @@ static int watchdog_nmi_enable(int cpu)
                goto out_save;
        }
 
-       printk(KERN_ERR "NMI watchdog failed to create perf event on cpu%i: %p\n", cpu, event);
+       printk(KERN_ERR "NMI watchdog disabled for cpu%i: unable to create perf event: %ld\n",
+              cpu, PTR_ERR(event));
        return PTR_ERR(event);
 
        /* success path */