From 6f394132d19943c81ce57f005f985c8b5d303878 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Tue, 8 May 2012 17:56:12 +0200 Subject: [PATCH] --- yaml --- r: 305418 b: refs/heads/master c: 29d679ffd850ea37a303bb930142be14982611e4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/nmi_selftest.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index bebf45377259..c3c583613503 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80b3e557371205566a71e569fbfcce5b11f92dbe +refs/heads/master: 29d679ffd850ea37a303bb930142be14982611e4 diff --git a/trunk/arch/x86/kernel/nmi_selftest.c b/trunk/arch/x86/kernel/nmi_selftest.c index 2c39dcd510fa..9f11dd3b6577 100644 --- a/trunk/arch/x86/kernel/nmi_selftest.c +++ b/trunk/arch/x86/kernel/nmi_selftest.c @@ -117,15 +117,15 @@ static void __init dotest(void (*testcase_fn)(void), int expected) unexpected_testcase_failures++; if (nmi_fail == FAILURE) - printk("FAILED |"); + printk(KERN_CONT "FAILED |"); else if (nmi_fail == TIMEOUT) - printk("TIMEOUT|"); + printk(KERN_CONT "TIMEOUT|"); else - printk("ERROR |"); + printk(KERN_CONT "ERROR |"); dump_stack(); } else { testcase_successes++; - printk(" ok |"); + printk(KERN_CONT " ok |"); } testcase_total++; @@ -150,10 +150,10 @@ void __init nmi_selftest(void) print_testname("remote IPI"); dotest(remote_ipi, SUCCESS); - printk("\n"); + printk(KERN_CONT "\n"); print_testname("local IPI"); dotest(local_ipi, SUCCESS); - printk("\n"); + printk(KERN_CONT "\n"); cleanup_nmi_testsuite();