From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 27 Jan 2008 07:03:54 +0000 (+0100)
Subject: printk: revert ktime_get() timestamps
X-Git-Tag: v2.6.25-rc1~1225
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=326e96b92306b7af24a3608ec01156cba17a3fc1;p=linux-2.6-omap-h63xx.git

printk: revert ktime_get() timestamps

revert 19ef9309273d26cb005cb23e6a370353dca91099.

Kevin Winchester reported a lockup during X startup an bisected
it to this commit.

Reported-by: Kevin Winchester <kjwinchester@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/kernel/printk.c b/kernel/printk.c
index 423a8c765a5..3b7c968d0ef 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -702,9 +702,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
 					loglev_char = default_message_loglevel
 						+ '0';
 				}
-				t = 0;
-				if (system_state != SYSTEM_BOOTING)
-					t = ktime_to_ns(ktime_get());
+				t = cpu_clock(printk_cpu);
 				nanosec_rem = do_div(t, 1000000000);
 				tlen = sprintf(tbuf,
 						"<%c>[%5lu.%06lu] ",