diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/compat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/compat.c b/fs/compat.c index 18b21b4c9e3a..ff0bafcff720 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
@@ -1743,7 +1743,7 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp, | |||
1743 | if ((u64)tv.tv_sec >= (u64)MAX_INT64_SECONDS) | 1743 | if ((u64)tv.tv_sec >= (u64)MAX_INT64_SECONDS) |
1744 | timeout = -1; /* infinite */ | 1744 | timeout = -1; /* infinite */ |
1745 | else { | 1745 | else { |
1746 | timeout = ROUND_UP(tv.tv_sec, 1000000/HZ); | 1746 | timeout = ROUND_UP(tv.tv_usec, 1000000/HZ); |
1747 | timeout += tv.tv_sec * HZ; | 1747 | timeout += tv.tv_sec * HZ; |
1748 | } | 1748 | } |
1749 | } | 1749 | } |
@@ -1884,7 +1884,7 @@ asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds, | |||
1884 | /* We assume that ts.tv_sec is always lower than | 1884 | /* We assume that ts.tv_sec is always lower than |
1885 | the number of seconds that can be expressed in | 1885 | the number of seconds that can be expressed in |
1886 | an s64. Otherwise the compiler bitches at us */ | 1886 | an s64. Otherwise the compiler bitches at us */ |
1887 | timeout = ROUND_UP(ts.tv_sec, 1000000000/HZ); | 1887 | timeout = ROUND_UP(ts.tv_nsec, 1000000000/HZ); |
1888 | timeout += ts.tv_sec * HZ; | 1888 | timeout += ts.tv_sec * HZ; |
1889 | } | 1889 | } |
1890 | 1890 | ||