Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=326e96b92306b7af24a3608ec01156cba17a3fc1
Commit:     326e96b92306b7af24a3608ec01156cba17a3fc1
Parent:     ef3f2de2b5496f721b12f21a157e19eac816394b
Author:     Ingo Molnar <[EMAIL PROTECTED]>
AuthorDate: Sun Jan 27 08:03:54 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Sun Jan 27 08:03:54 2008 +0100

    printk: revert ktime_get() timestamps
    
    revert 19ef9309273d26cb005cb23e6a370353dca91099.
    
    Kevin Winchester reported a lockup during X startup an bisected
    it to this commit.
    
    Reported-by: Kevin Winchester <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
 kernel/printk.c |    4 +---
 1 files changed, 1 insertions(+), 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] ",
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to