diff options
Diffstat (limited to 'arch/x86/kernel/nmi_selftest.c')
-rw-r--r-- | arch/x86/kernel/nmi_selftest.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c index 2c39dcd510fa..e31bf8d5c4d2 100644 --- a/arch/x86/kernel/nmi_selftest.c +++ b/arch/x86/kernel/nmi_selftest.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/cpumask.h> | 13 | #include <linux/cpumask.h> |
14 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/percpu.h> | ||
16 | 17 | ||
17 | #include <asm/apic.h> | 18 | #include <asm/apic.h> |
18 | #include <asm/nmi.h> | 19 | #include <asm/nmi.h> |
@@ -117,15 +118,15 @@ static void __init dotest(void (*testcase_fn)(void), int expected) | |||
117 | unexpected_testcase_failures++; | 118 | unexpected_testcase_failures++; |
118 | 119 | ||
119 | if (nmi_fail == FAILURE) | 120 | if (nmi_fail == FAILURE) |
120 | printk("FAILED |"); | 121 | printk(KERN_CONT "FAILED |"); |
121 | else if (nmi_fail == TIMEOUT) | 122 | else if (nmi_fail == TIMEOUT) |
122 | printk("TIMEOUT|"); | 123 | printk(KERN_CONT "TIMEOUT|"); |
123 | else | 124 | else |
124 | printk("ERROR |"); | 125 | printk(KERN_CONT "ERROR |"); |
125 | dump_stack(); | 126 | dump_stack(); |
126 | } else { | 127 | } else { |
127 | testcase_successes++; | 128 | testcase_successes++; |
128 | printk(" ok |"); | 129 | printk(KERN_CONT " ok |"); |
129 | } | 130 | } |
130 | testcase_total++; | 131 | testcase_total++; |
131 | 132 | ||
@@ -150,10 +151,10 @@ void __init nmi_selftest(void) | |||
150 | 151 | ||
151 | print_testname("remote IPI"); | 152 | print_testname("remote IPI"); |
152 | dotest(remote_ipi, SUCCESS); | 153 | dotest(remote_ipi, SUCCESS); |
153 | printk("\n"); | 154 | printk(KERN_CONT "\n"); |
154 | print_testname("local IPI"); | 155 | print_testname("local IPI"); |
155 | dotest(local_ipi, SUCCESS); | 156 | dotest(local_ipi, SUCCESS); |
156 | printk("\n"); | 157 | printk(KERN_CONT "\n"); |
157 | 158 | ||
158 | cleanup_nmi_testsuite(); | 159 | cleanup_nmi_testsuite(); |
159 | 160 | ||