From 5517a2eed5fe660b80d02bb46b698cdeb4c10c51 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 19 Jan 2006 16:40:42 -0800 Subject: [PATCH] --- yaml --- r: 19010 b: refs/heads/master c: 7e732bfc5570b8f9bb5f155cf36e94b2e7d6bf6a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/compat.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2054a155b835..f64cf1a2d750 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f36b018b2e314d45af86449f1a97facb1fbe300 +refs/heads/master: 7e732bfc5570b8f9bb5f155cf36e94b2e7d6bf6a diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c index 18b21b4c9e3a..ff0bafcff720 100644 --- a/trunk/fs/compat.c +++ b/trunk/fs/compat.c @@ -1743,7 +1743,7 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp, if ((u64)tv.tv_sec >= (u64)MAX_INT64_SECONDS) timeout = -1; /* infinite */ else { - timeout = ROUND_UP(tv.tv_sec, 1000000/HZ); + timeout = ROUND_UP(tv.tv_usec, 1000000/HZ); timeout += tv.tv_sec * HZ; } } @@ -1884,7 +1884,7 @@ asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds, /* We assume that ts.tv_sec is always lower than the number of seconds that can be expressed in an s64. Otherwise the compiler bitches at us */ - timeout = ROUND_UP(ts.tv_sec, 1000000000/HZ); + timeout = ROUND_UP(ts.tv_nsec, 1000000000/HZ); timeout += ts.tv_sec * HZ; }