Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29d679ff authored by Sasha Levin's avatar Sasha Levin Committed by H. Peter Anvin
Browse files

x86, printk: Add missing KERN_CONT to NMI selftest 



Fix this behaviour:

----------------
| NMI testsuite:
--------------------
  remote IPI:
  ok  |

   local IPI:
  ok  |

Revealed due to a new modification to printk().

Signed-off-by: default avatarSasha Levin <levinsasha928@gmail.com>
Link: http://lkml.kernel.org/r/1336492573-17530-3-git-send-email-levinsasha928@gmail.com


Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 80b3e557

arch/x86/kernel/nmi_selftest.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -117,15 +117,15 @@ static void __init dotest(void (*testcase_fn)(void), int expected) 
		unexpected_testcase_failures++;

		unexpected_testcase_failures++;





		if (nmi_fail == FAILURE)

		if (nmi_fail == FAILURE)

			printk("FAILED |");

			printk(KERN_CONT "FAILED |");

		else if (nmi_fail == TIMEOUT)

		else if (nmi_fail == TIMEOUT)

			printk("TIMEOUT|");

			printk(KERN_CONT "TIMEOUT|");

		else

		else

			printk("ERROR  |");

			printk(KERN_CONT "ERROR  |");

		dump_stack();

		dump_stack();

	} else {

	} else {

		testcase_successes++;

		testcase_successes++;

		printk("  ok  |");

		printk(KERN_CONT "  ok  |");

	}

	}

	testcase_total++;

	testcase_total++;
@@ -150,10 +150,10 @@ void __init nmi_selftest(void) 




	print_testname("remote IPI");

	print_testname("remote IPI");

	dotest(remote_ipi, SUCCESS);

	dotest(remote_ipi, SUCCESS);

	printk("\n");

	printk(KERN_CONT "\n");

	print_testname("local IPI");

	print_testname("local IPI");

	dotest(local_ipi, SUCCESS);

	dotest(local_ipi, SUCCESS);

	printk("\n");

	printk(KERN_CONT "\n");





	cleanup_nmi_testsuite();

	cleanup_nmi_testsuite();