diff --git a/[refs] b/[refs] index 604b45594432..0697dbbabe16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32a76006683f7b28ae3cc491da37716e002f198e +refs/heads/master: d713f519332e029d43eca8462629314eee1ded86 diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index e6c1f36d8c3a..5f9d053699f9 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -707,7 +707,7 @@ asmlinkage int vprintk(const char *fmt, va_list args) loglev_char = default_message_loglevel + '0'; } - t = printk_clock(); + t = cpu_clock(printk_cpu); nanosec_rem = do_div(t, 1000000000); tlen = sprintf(tbuf, "<%c>[%5lu.%06lu] ",