diff options
author | Sasha Levin <levinsasha928@gmail.com> | 2012-05-08 11:56:12 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-21 13:13:04 -0400 |
commit | 29d679ffd850ea37a303bb930142be14982611e4 (patch) | |
tree | df4753c85da21db4984312cf90e6b72bcc745f5b /arch/x86/kernel/nmi_selftest.c | |
parent | 80b3e557371205566a71e569fbfcce5b11f92dbe (diff) |
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>
Diffstat (limited to 'arch/x86/kernel/nmi_selftest.c')
-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) | |||
117 | unexpected_testcase_failures++; | 117 | unexpected_testcase_failures++; |
118 | 118 | ||
119 | if (nmi_fail == FAILURE) | 119 | if (nmi_fail == FAILURE) |
120 | printk("FAILED |"); | 120 | printk(KERN_CONT "FAILED |"); |
121 | else if (nmi_fail == TIMEOUT) | 121 | else if (nmi_fail == TIMEOUT) |
122 | printk("TIMEOUT|"); | 122 | printk(KERN_CONT "TIMEOUT|"); |
123 | else | 123 | else |
124 | printk("ERROR |"); | 124 | printk(KERN_CONT "ERROR |"); |
125 | dump_stack(); | 125 | dump_stack(); |
126 | } else { | 126 | } else { |
127 | testcase_successes++; | 127 | testcase_successes++; |
128 | printk(" ok |"); | 128 | printk(KERN_CONT " ok |"); |
129 | } | 129 | } |
130 | testcase_total++; | 130 | testcase_total++; |
131 | 131 | ||
@@ -150,10 +150,10 @@ void __init nmi_selftest(void) | |||
150 | 150 | ||
151 | print_testname("remote IPI"); | 151 | print_testname("remote IPI"); |
152 | dotest(remote_ipi, SUCCESS); | 152 | dotest(remote_ipi, SUCCESS); |
153 | printk("\n"); | 153 | printk(KERN_CONT "\n"); |
154 | print_testname("local IPI"); | 154 | print_testname("local IPI"); |
155 | dotest(local_ipi, SUCCESS); | 155 | dotest(local_ipi, SUCCESS); |
156 | printk("\n"); | 156 | printk(KERN_CONT "\n"); |
157 | 157 | ||
158 | cleanup_nmi_testsuite(); | 158 | cleanup_nmi_testsuite(); |
159 | 159 | ||