---

yaml --- r: 76200 b: refs/heads/master c: 19ef930 h: refs/heads/master v: v3
git-mirror · Jan 25, 2008 · 287849a · 287849a
1 parent 8a12033
commit 287849a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90739081ef8d5495d50abba9c5d333be9acd872a
+refs/heads/master: 19ef9309273d26cb005cb23e6a370353dca91099
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
@@ -702,7 +702,9 @@ asmlinkage int vprintk(const char *fmt, va_list args)
 					loglev_char = default_message_loglevel
 						+ '0';
 				}
-				t = cpu_clock(printk_cpu);
+				t = 0;
+				if (system_state != SYSTEM_BOOTING)
+					t = ktime_to_ns(ktime_get());
 				nanosec_rem = do_div(t, 1000000000);
 				tlen = sprintf(tbuf,
 						"<%c>[%5lu.%06lu] ",