aboutsummaryrefslogtreecommitdiff
path: root/kernel/printk.c
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-05-08 13:04:17 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-08 08:55:26 -0700
commit5fc3249068c1ed87c6fd485f42ced24132405629 (patch)
tree31b2c682930b03e45fe27bc34c8b376e00da408e /kernel/printk.c
parenta9e73211fb0fc875637793a8af770f3678b6c278 (diff)
kmsg: use do_div() to divide 64bit integer
On Tue, May 8, 2012 at 10:02 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > kernel/built-in.o: In function `devkmsg_read': > printk.c:(.text+0x27e8): undefined reference to `__udivdi3' > Most probably the "msg->ts_nsec / 1000" since > ts_nsec is a u64 and this is a 32 bit build ... Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Kay Sievers <kay@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/printk.c')
-rw-r--r--kernel/printk.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index 1ccc6d986cb..96d4cc89225 100644
--- a/kernel/printk.c
+++ b/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++) {