Skip to content

Commit

Permalink
x86, printk: Add missing KERN_CONT to NMI selftest
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sasha Levin authored and H. Peter Anvin committed May 21, 2012
1 parent 80b3e55 commit 29d679f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions arch/x86/kernel/nmi_selftest.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++;

Expand All @@ -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();

Expand Down

0 comments on commit 29d679f

Please sign in to comment.