From 497d0a0c0a5a737378303ecf1bc23858979a8847 Mon Sep 17 00:00:00 2001 From: Davide Libenzi Date: Thu, 26 Jul 2007 10:41:07 -0700 Subject: [PATCH] --- yaml --- r: 62983 b: refs/heads/master c: 098284020c47c1212d211e39ae2b41c21182e056 h: refs/heads/master i: 62981: d0f2551f57c2384e49a0dd4b8888e28ce3776590 62979: 3fa8f9da0e7a4c4e9813f04eb6de43efaee48aad 62975: cafae32b366b6c1aca3c9fbad467daa3bf29d168 v: v3 --- [refs] | 2 +- trunk/fs/timerfd.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d22785f7a385..e7209cba6385 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1cdd4a64f6ce15a1e81759ef99eed3a91f9acbe +refs/heads/master: 098284020c47c1212d211e39ae2b41c21182e056 diff --git a/trunk/fs/timerfd.c b/trunk/fs/timerfd.c index af9eca5c0230..61983f3b107c 100644 --- a/trunk/fs/timerfd.c +++ b/trunk/fs/timerfd.c @@ -95,7 +95,7 @@ static ssize_t timerfd_read(struct file *file, char __user *buf, size_t count, { struct timerfd_ctx *ctx = file->private_data; ssize_t res; - u32 ticks = 0; + u64 ticks = 0; DECLARE_WAITQUEUE(wait, current); if (count < sizeof(ticks)) @@ -130,7 +130,7 @@ static ssize_t timerfd_read(struct file *file, char __user *buf, size_t count, * callback to avoid DoS attacks specifying a very * short timer period. */ - ticks = (u32) + ticks = (u64) hrtimer_forward(&ctx->tmr, hrtimer_cb_get_time(&ctx->tmr), ctx->tintv); @@ -140,7 +140,7 @@ static ssize_t timerfd_read(struct file *file, char __user *buf, size_t count, } spin_unlock_irq(&ctx->wqh.lock); if (ticks) - res = put_user(ticks, buf) ? -EFAULT: sizeof(ticks); + res = put_user(ticks, (u64 __user *) buf) ? -EFAULT: sizeof(ticks); return res; }