From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 25 Jan 2008 20:07:58 +0000 (+0100)
Subject: sched: fix CONFIG_PRINT_TIME's reliance on sched_clock()
X-Git-Tag: v2.6.25-rc1~1237^2~94
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d713f519332e029d43eca8462629314eee1ded86;p=linux-2.6

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>
---

diff --git a/kernel/printk.c b/kernel/printk.c
index e6c1f36d8c..5f9d053699 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] ",