Merge branch 'for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[mirror_ubuntu-artful-kernel.git] / kernel / watchdog.c

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index b04f680c4735b6a6da5a86f44443cfb9aef83b88..b3ace6ebbba3934ca52b6e5a6e420183da233fdc 100644 (file)
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -367,7 +367,7 @@ static void watchdog_overflow_callback(struct perf_event *event,
                        trigger_allbutself_cpu_backtrace();
 
                if (hardlockup_panic)
-                       panic("Hard LOCKUP");
+                       nmi_panic(regs, "Hard LOCKUP");
 
                __this_cpu_write(hard_watchdog_warn, true);
                return;