summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/nmi_selftest.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-23 10:21:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-23 10:21:19 -0700
commite7b30a17c1ef5cbc67c5381407d2d03484b8def3 (patch)
treeac54eb1084609a1d8d910e563299b3d7a2587020 /arch/x86/kernel/nmi_selftest.c
parent19bec32d7f26f263dba13f2797d9c3245de2020b (diff)
parentb2d668da9307c4c163dd603d2bb3cadb10f9fd37 (diff)
downloadblackbird-op-linux-e7b30a17c1ef5cbc67c5381407d2d03484b8def3.tar.gz
blackbird-op-linux-e7b30a17c1ef5cbc67c5381407d2d03484b8def3.zip
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/urgent branch from Ingo Molnar: "These are the fixes left over from the very end of the v3.4 stabilization cycle, plus one more fix." Ugh. Those KERN_CONT additions are just pointless. I think they came as a reaction to some of the early (broken) printk() work - but that was fixed before it was merged. * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, relocs: Build clean fix x86, printk: Add missing KERN_CONT to NMI selftest x86: Fix boot on Twinhead H12Y
Diffstat (limited to 'arch/x86/kernel/nmi_selftest.c')
-rw-r--r--arch/x86/kernel/nmi_selftest.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
index ff3698625081..e31bf8d5c4d2 100644
--- a/arch/x86/kernel/nmi_selftest.c
+++ b/arch/x86/kernel/nmi_selftest.c
@@ -118,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++;
@@ -151,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();
OpenPOWER on IntegriCloud