Messages in this thread Patch in this message | | | Date | Sun, 27 Jan 2008 08:12:40 +0100 | From | Ingo Molnar <> | Subject | [git pull] printk fix (was: Re: X fails to start with latest Linus git) |
| |
Linus,
please pull the following printk fix:
git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git
it reverts 19ef9309273d: Kevin Winchester reported a CONFIG_PRINTK_TIME=y related hang during X startup, and biscted it down to this commit.
Ingo
------------------> Ingo Molnar (1): printk: revert ktime_get() timestamps
printk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/kernel/printk.c b/kernel/printk.c index 423a8c7..3b7c968 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -702,9 +702,7 @@ asmlinkage int vprintk(const char *fmt, va_list args) loglev_char = default_message_loglevel + '0'; } - t = 0; - if (system_state != SYSTEM_BOOTING) - t = ktime_to_ns(ktime_get()); + t = cpu_clock(printk_cpu); nanosec_rem = do_div(t, 1000000000); tlen = sprintf(tbuf, "<%c>[%5lu.%06lu] ",
| |