From: Andrew Morton <akpm@osdl.org>
Date: Wed, 1 Feb 2006 11:04:49 +0000 (-0800)
Subject: [PATCH] compat_sys_pselect7() fix
X-Git-Tag: v2.6.16-rc2~155
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb82a6cdf994d6656ad0a25ed28395af3416a27c;p=linux-2.6

[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>
---

diff --git a/fs/compat.c b/fs/compat.c
index ff0bafcff7..cc58a20df5 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;