mac80211: restructuring data Rx handlers

[mv-sheeva.git] / kernel / printk.c

diff --git a/kernel/printk.c b/kernel/printk.c
index 423a8c765a5788fc1b422d87add42d8649ec9d31..3b7c968d0ef994e8be14ef780835d96634761881 100644 (file)
--- 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] ",