summaryrefslogtreecommitdiffstats
path: root/fs/compat.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-02-01 03:04:49 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-01 08:53:10 -0800
commitcb82a6cdf994d6656ad0a25ed28395af3416a27c (patch)
tree4909677ccac581360f41722bb45c724b6fa01eee /fs/compat.c
parent4ff0c007b2854b9ca4dca3a104ee3e4c146c02d6 (diff)
downloadop-kernel-dev-cb82a6cdf994d6656ad0a25ed28395af3416a27c.zip
op-kernel-dev-cb82a6cdf994d6656ad0a25ed28395af3416a27c.tar.gz
[PATCH] compat_sys_pselect7() fix
fs/compat.c: In function `compat_sys_pselect7': fs/compat.c:1820: warning: passing arg 5 of `compat_core_sys_select' from incompatible pointer type Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/compat.c')
-rw-r--r--fs/compat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/compat.c b/fs/compat.c
index ff0bafc..cc58a20 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -1781,7 +1781,7 @@ asmlinkage long compat_sys_pselect7(int n, compat_ulong_t __user *inp,
{
compat_sigset_t ss32;
sigset_t ksigmask, sigsaved;
- long timeout = MAX_SCHEDULE_TIMEOUT;
+ s64 timeout = MAX_SCHEDULE_TIMEOUT;
struct compat_timespec ts;
int ret;
OpenPOWER on IntegriCloud