]> Pileus Git - ~andy/linux/commitdiff
x86, printk: Add missing KERN_CONT to NMI selftest
authorSasha Levin <levinsasha928@gmail.com>
Tue, 8 May 2012 15:56:12 +0000 (17:56 +0200)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 21 May 2012 17:13:04 +0000 (10:13 -0700)
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>
arch/x86/kernel/nmi_selftest.c

index 2c39dcd510faee65feb37f1647578d2a0bb46975..9f11dd3b657738a4422c3005ae9f6bcbf4520b74 100644 (file)
@@ -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++;
 
@@ -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();