diff options
| author | Sasha Levin <levinsasha928@gmail.com> | 2012-05-08 17:56:12 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-21 19:13:04 +0200 |
| commit | 29d679ffd850ea37a303bb930142be14982611e4 (patch) | |
| tree | df4753c85da21db4984312cf90e6b72bcc745f5b | |
| parent | x86: Fix boot on Twinhead H12Y (diff) | |
| download | linux-29d679ffd850ea37a303bb930142be14982611e4.tar.xz linux-29d679ffd850ea37a303bb930142be14982611e4.zip | |
x86, printk: Add missing KERN_CONT to NMI selftest
Fix this behaviour:
----------------
| NMI testsuite:
--------------------
remote IPI:
ok |
local IPI:
ok |
Revealed due to a new modification to printk().
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Link: http://lkml.kernel.org/r/1336492573-17530-3-git-send-email-levinsasha928@gmail.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| -rw-r--r-- | arch/x86/kernel/nmi_selftest.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c index 2c39dcd510fa..9f11dd3b6577 100644 --- a/arch/x86/kernel/nmi_selftest.c +++ b/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(); |