From 8aaf70f59acfede6e4a59825eb7c21e5f5910622 Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Fri, 4 Jan 2013 15:35:50 -0800 Subject: [PATCH] --- yaml --- r: 348299 b: refs/heads/master c: 35dac27cedd14c3b6fcd4ba7bc3c31738cfd1831 h: refs/heads/master i: 348297: a2e7d3c6f350305a8a7ad46a60edc0e545d5287b 348295: 191c49a6744523ca20d033e49b52d67768625793 v: v3 --- [refs] | 2 +- trunk/kernel/printk.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index daf5b5b676b7..b9564659d16b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f90b68309683f2c5765a1b04ca23d71e51f1494 +refs/heads/master: 35dac27cedd14c3b6fcd4ba7bc3c31738cfd1831 diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 19c0d7bcf24a..357f714ddd49 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -870,10 +870,11 @@ static size_t print_time(u64 ts, char *buf) if (!printk_time) return 0; + rem_nsec = do_div(ts, 1000000000); + if (!buf) - return 15; + return snprintf(NULL, 0, "[%5lu.000000] ", (unsigned long)ts); - rem_nsec = do_div(ts, 1000000000); return sprintf(buf, "[%5lu.%06lu] ", (unsigned long)ts, rem_nsec / 1000); }