From 287849a1cbd4fb3cf3c30332ac5ff2ed29ea257a Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 25 Jan 2008 21:08:34 +0100 Subject: [PATCH] --- yaml --- r: 76200 b: refs/heads/master c: 19ef9309273d26cb005cb23e6a370353dca91099 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/printk.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1a30e31b8233..ec0063a7cae7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90739081ef8d5495d50abba9c5d333be9acd872a +refs/heads/master: 19ef9309273d26cb005cb23e6a370353dca91099 diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 3b7c968d0ef9..423a8c765a57 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -702,7 +702,9 @@ asmlinkage int vprintk(const char *fmt, va_list args) loglev_char = default_message_loglevel + '0'; } - t = cpu_clock(printk_cpu); + t = 0; + if (system_state != SYSTEM_BOOTING) + t = ktime_to_ns(ktime_get()); nanosec_rem = do_div(t, 1000000000); tlen = sprintf(tbuf, "<%c>[%5lu.%06lu] ",