mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: tip-bot for Sasha Levin <levinsasha928@gmail.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, levinsasha928@gmail.com,
	hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de
Subject: [tip:x86/urgent] x86, printk: Add missing KERN_CONT to NMI selftest
Date: Mon, 21 May 2012 10:25:47 -0700	[thread overview]
Message-ID: <tip-29d679ffd850ea37a303bb930142be14982611e4@git.kernel.org> (raw)
In-Reply-To: <1336492573-17530-3-git-send-email-levinsasha928@gmail.com>

Commit-ID:  29d679ffd850ea37a303bb930142be14982611e4
Gitweb:     http://git.kernel.org/tip/29d679ffd850ea37a303bb930142be14982611e4
Author:     Sasha Levin <levinsasha928@gmail.com>
AuthorDate: Tue, 8 May 2012 17:56:12 +0200
Committer:  H. Peter Anvin <hpa@zytor.com>
CommitDate: Mon, 21 May 2012 10:13:04 -0700

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: 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 |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
index 2c39dcd..9f11dd3 100644
--- a/arch/x86/kernel/nmi_selftest.c
+++ b/arch/x86/kernel/nmi_selftest.c
@@ -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();
 

  reply	other threads:[~2012-05-21 17:26 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-08 15:56 [PATCH 1/4] mm: add missing KERN_CONT to free_area_init_nodes Sasha Levin
2012-05-08 15:56 ` [PATCH 2/4] locking: add KERN_CONT when needed to self test Sasha Levin
2012-05-08 15:56 ` [PATCH 3/4] x86, NMI: add missing KERN_CONT to NMI selftest Sasha Levin
2012-05-21 17:25   ` tip-bot for Sasha Levin [this message]
2012-05-21 17:29     ` [tip:x86/urgent] x86, printk: Add " Joe Perches
2012-05-21 17:42       ` H. Peter Anvin
2012-05-21 17:56         ` Joe Perches
2012-05-21 17:57           ` H. Peter Anvin
2012-05-22  2:49             ` [PATCH 1/2] x86: asm: Add KERN_<LEVEL> to printks Joe Perches
2012-05-22  2:50             ` [PATCH 2/2] x86: Add KERN_<LEVEL> to bare printks, convert printks to pr_<level> Joe Perches
2012-06-06 15:03               ` [tip:x86/debug] x86/debug: " tip-bot for Joe Perches
2012-05-08 15:56 ` [PATCH 4/4] ISDN: add missing KERN_CONT Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-29d679ffd850ea37a303bb930142be14982611e4@git.kernel.org \
    --to=levinsasha928@gmail.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome