From 7689f9ff635d70644fbccd811d8e4dce62630f8f Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Tue, 8 May 2012 13:04:17 +0200
Subject: [PATCH] --- yaml --- r: 304088 b: refs/heads/master c:
 5fc3249068c1ed87c6fd485f42ced24132405629 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/printk.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6cadf3d704a0..3b0c7d069459 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9e73211fb0fc875637793a8af770f3678b6c278
+refs/heads/master: 5fc3249068c1ed87c6fd485f42ced24132405629
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index 1ccc6d986cb3..96d4cc892255 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -407,6 +407,7 @@ static ssize_t devkmsg_read(struct file *file, char __user *buf,
 {
 	struct devkmsg_user *user = file->private_data;
 	struct log *msg;
+	u64 ts_usec;
 	size_t i;
 	size_t len;
 	ssize_t ret;
@@ -441,8 +442,10 @@ static ssize_t devkmsg_read(struct file *file, char __user *buf,
 	}
 
 	msg = log_from_idx(user->idx);
+	ts_usec = msg->ts_nsec;
+	do_div(ts_usec, 1000);
 	len = sprintf(user->buf, "%u,%llu,%llu;",
-		      msg->level, user->seq, msg->ts_nsec / 1000);
+		      msg->level, user->seq, ts_usec);
 
 	/* escape non-printable characters */
 	for (i = 0; i < msg->text_len; i++) {