Commit 326e96b92306b7af24a3608ec01156cba17a3fc1
1 parent
ef3f2de2b5
Exists in
master
and in
7 other branches
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>
Showing 1 changed file with 1 additions and 3 deletions Side-by-side Diff
kernel/printk.c
| ... | ... | @@ -702,9 +702,7 @@ |
| 702 | 702 | loglev_char = default_message_loglevel |
| 703 | 703 | + '0'; |
| 704 | 704 | } |
| 705 | - t = 0; | |
| 706 | - if (system_state != SYSTEM_BOOTING) | |
| 707 | - t = ktime_to_ns(ktime_get()); | |
| 705 | + t = cpu_clock(printk_cpu); | |
| 708 | 706 | nanosec_rem = do_div(t, 1000000000); |
| 709 | 707 | tlen = sprintf(tbuf, |
| 710 | 708 | "<%c>[%5lu.%06lu] ", |