panic, x86: Fix re-entrance problem due to panic on NMI

[linux-2.6-block.git] / kernel / watchdog.c

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