Merge git://www.linux-watchdog.org/linux-watchdog

[pandora-kernel.git] / kernel / watchdog.c

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 1241d8c..51c4f34 100644 (file)
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -553,14 +553,6 @@ void __init lockup_detector_init(void)
 {
        set_sample_period();
 
-#ifdef CONFIG_NO_HZ_FULL
-       if (watchdog_user_enabled) {
-               watchdog_user_enabled = 0;
-               pr_warning("Disabled lockup detectors by default for full dynticks\n");
-               pr_warning("You can reactivate it with 'sysctl -w kernel.watchdog=1'\n");
-       }
-#endif
-
        if (watchdog_user_enabled)
                watchdog_enable_all_cpus();
 }