Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[karo-tx-linux.git] / arch / x86 / kernel / nmi_selftest.c

diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
index 2c39dcd510faee65feb37f1647578d2a0bb46975..e31bf8d5c4d2e410126f397cdb764c281b1693fc 100644 (file)
--- a/arch/x86/kernel/nmi_selftest.c
+++ b/arch/x86/kernel/nmi_selftest.c
@@ -13,6 +13,7 @@
 #include <linux/cpumask.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/percpu.h>
 
 #include <asm/apic.h>
 #include <asm/nmi.h>
@@ -117,15 +118,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 +151,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();