From 61a11a41f33b02cbed2294b2f6df177225388ec6 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Sun, 27 Jan 2008 08:03:54 +0100 Subject: [PATCH] --- yaml --- r: 77308 b: refs/heads/master c: 326e96b92306b7af24a3608ec01156cba17a3fc1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/printk.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a8c5ec30da91..05a73643bfba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef3f2de2b5496f721b12f21a157e19eac816394b +refs/heads/master: 326e96b92306b7af24a3608ec01156cba17a3fc1 diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 423a8c765a57..3b7c968d0ef9 100644 --- a/trunk/kernel/printk.c +++ b/trunk/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] ",