aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-01-27 02:03:54 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-27 02:03:54 -0500
commit326e96b92306b7af24a3608ec01156cba17a3fc1 (patch)
treea70525568e34cc8c49e726435e9055ceab6e67dc /kernel
parentef3f2de2b5496f721b12f21a157e19eac816394b (diff)
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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index 423a8c765a57..3b7c968d0ef9 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -702,9 +702,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
702 loglev_char = default_message_loglevel 702 loglev_char = default_message_loglevel
703 + '0'; 703 + '0';
704 } 704 }
705 t = 0; 705 t = cpu_clock(printk_cpu);
706 if (system_state != SYSTEM_BOOTING)
707 t = ktime_to_ns(ktime_get());
708 nanosec_rem = do_div(t, 1000000000); 706 nanosec_rem = do_div(t, 1000000000);
709 tlen = sprintf(tbuf, 707 tlen = sprintf(tbuf,
710 "<%c>[%5lu.%06lu] ", 708 "<%c>[%5lu.%06lu] ",