From fd150b6f8a194cb9b21dc38a3ca891ac8535d39a Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 6 Dec 2006 20:40:51 -0800
Subject: [PATCH] --- yaml --- r: 42965 b: refs/heads/master c:
 792908225064b1d841a8990b9d1d1cfc4e0e5bb2 h: refs/heads/master i:   42963:
 82dbd047545f4b9d846398e9261b9c28a0b81fc6 v: v3

---
 [refs]                                    |  2 +-
 trunk/Documentation/kernel-parameters.txt |  4 ++++
 trunk/kernel/printk.c                     | 14 +++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cd8d80a54292..819111cef5a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70e4506765602cca047cfa31933836e354c61a63
+refs/heads/master: 792908225064b1d841a8990b9d1d1cfc4e0e5bb2
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index 2a40d9f6ffad..6b3c3e37a277 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -650,6 +650,10 @@ and is between 256 and 4096 characters. It is defined in the file
 	idle=		[HW]
 			Format: idle=poll or idle=halt
 
+	ignore_loglevel	[KNL]
+			Ignore loglevel setting - this will print /all/
+			kernel messages to the console. Useful for debugging.
+
 	ihash_entries=	[KNL]
 			Set number of hash buckets for inode cache.
 
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index c3d90a58e4c5..185bb45eacf7 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -333,13 +333,25 @@ static void __call_console_drivers(unsigned long start, unsigned long end)
 	}
 }
 
+static int __read_mostly ignore_loglevel;
+
+int __init ignore_loglevel_setup(char *str)
+{
+	ignore_loglevel = 1;
+	printk(KERN_INFO "debug: ignoring loglevel setting.\n");
+
+	return 1;
+}
+
+__setup("ignore_loglevel", ignore_loglevel_setup);
+
 /*
  * Write out chars from start to end - 1 inclusive
  */
 static void _call_console_drivers(unsigned long start,
 				unsigned long end, int msg_log_level)
 {
-	if (msg_log_level < console_loglevel &&
+	if ((msg_log_level < console_loglevel || ignore_loglevel) &&
 			console_drivers && start != end) {
 		if ((start & LOG_BUF_MASK) > (end & LOG_BUF_MASK)) {
 			/* wrapped write */