diff --git a/[refs] b/[refs] index 1393e44149b4..5a9fa8802e4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66dcca062847bcd261ebb3ac96d51101f31a8630 +refs/heads/master: 31f6d9d628739c097964b8dbae939ea997da94a3 diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index a967605bc2e3..4b8f0f9230a4 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -488,6 +488,11 @@ static int __init printk_time_setup(char *str) __setup("time", printk_time_setup); +__attribute__((weak)) unsigned long long printk_clock(void) +{ + return sched_clock(); +} + /* * This is printk. It can be called from any context. We want it to work. * @@ -565,7 +570,7 @@ asmlinkage int vprintk(const char *fmt, va_list args) loglev_char = default_message_loglevel + '0'; } - t = sched_clock(); + t = printk_clock(); nanosec_rem = do_div(t, 1000000000); tlen = sprintf(tbuf, "<%c>[%5lu.%06lu] ",