Commit 326e96b9 authored by Ingo Molnar's avatar Ingo Molnar

printk: revert ktime_get() timestamps

revert 19ef9309.

Kevin Winchester reported a lockup during X startup an bisected
it to this commit.
Reported-by: default avatarKevin Winchester <kjwinchester@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ef3f2de2
...@@ -702,9 +702,7 @@ asmlinkage int vprintk(const char *fmt, va_list args) ...@@ -702,9 +702,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
loglev_char = default_message_loglevel loglev_char = default_message_loglevel
+ '0'; + '0';
} }
t = 0; t = cpu_clock(printk_cpu);
if (system_state != SYSTEM_BOOTING)
t = ktime_to_ns(ktime_get());
nanosec_rem = do_div(t, 1000000000); nanosec_rem = do_div(t, 1000000000);
tlen = sprintf(tbuf, tlen = sprintf(tbuf,
"<%c>[%5lu.%06lu] ", "<%c>[%5lu.%06lu] ",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment