diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-23 12:51:00 -0800 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-23 12:51:00 -0800 |
| commit | 4c8af5254e741983e141e10002e01abba87f8419 (patch) | |
| tree | a932954630715a0e9b4f20fdfe74255b441096c5 /fs | |
| parent | 0820e15a35b3cf37caadf550ddb7c75a7a77afd0 (diff) | |
| parent | 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 (diff) | |
| download | linux-3.10-4c8af5254e741983e141e10002e01abba87f8419.tar.gz linux-3.10-4c8af5254e741983e141e10002e01abba87f8419.tar.bz2 linux-3.10-4c8af5254e741983e141e10002e01abba87f8419.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
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 18b21b4c9e3..ff0bafcff72 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, 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; } |