summaryrefslogtreecommitdiffstats
path: root/kernel/printk.c
diff options
context:
space:
mode:
authorIngo Molnar2008-01-25 21:07:58 +0100
committerIngo Molnar2008-01-25 21:07:58 +0100
commitd713f519332e029d43eca8462629314eee1ded86 (patch)
tree2bce92a20518105d8884b2bf5ff6fb1b5e3d7636 /kernel/printk.c
parentprintk: make printk more robust by not allowing recursion (diff)
downloadkernel-qcow2-linux-d713f519332e029d43eca8462629314eee1ded86.tar.gz
kernel-qcow2-linux-d713f519332e029d43eca8462629314eee1ded86.tar.xz
kernel-qcow2-linux-d713f519332e029d43eca8462629314eee1ded86.zip
sched: fix CONFIG_PRINT_TIME's reliance on sched_clock()
Stefano Brivio reported weird printk timestamp behavior during CPU frequency changes: http://bugzilla.kernel.org/show_bug.cgi?id=9475 fix CONFIG_PRINT_TIME's reliance on sched_clock() and use cpu_clock() instead. Reported-and-bisected-by: Stefano Brivio <stefano.brivio@polimi.it> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/printk.c')
-rw-r--r--kernel/printk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index e6c1f36d8c3a..5f9d053699f9 100644
--- a/kernel/printk.c
+++ b/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] ",