From 394f967af5d70ebe7035549e4debd2cc0d7f3a00 Mon Sep 17 00:00:00 2001 From: Chuck Ebbert <76306.1226@compuserve.com> Date: Mon, 12 Sep 2005 18:49:24 +0200 Subject: [PATCH] --- yaml --- r: 8631 b: refs/heads/master c: 847815760cc0f41985b3185d780aa4369fcb475d h: refs/heads/master i: 8629: f3356dfe7f560b54a66c6716b1b35bdbe03f332d 8627: 854f80d85752ef0d5f781ba9b598e1fb6387d847 8623: 389218ee6c8bb65b2dfffcf58036ae000c5391c3 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/nmi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 00330c581a5a..1c12e7edf4b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2d236b3ac8fcbbf1bae7d815294d258ba24e3f5 +refs/heads/master: 847815760cc0f41985b3185d780aa4369fcb475d diff --git a/trunk/arch/x86_64/kernel/nmi.c b/trunk/arch/x86_64/kernel/nmi.c index caf164959e19..330b35794055 100644 --- a/trunk/arch/x86_64/kernel/nmi.c +++ b/trunk/arch/x86_64/kernel/nmi.c @@ -488,8 +488,8 @@ void nmi_watchdog_tick (struct pt_regs * regs, unsigned reason) == NOTIFY_STOP) { local_set(&__get_cpu_var(alert_counter), 0); return; - } - die_nmi("NMI Watchdog detected LOCKUP on CPU%d", regs); + } + die_nmi("NMI Watchdog detected LOCKUP on CPU %d\n", regs); } } else { __get_cpu_var(last_irq_sum) = sum;