From d277d92c867c95f155891af478b46573d353249c Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Wed, 1 Feb 2006 03:04:49 -0800
Subject: [PATCH] --- yaml --- r: 19324 b: refs/heads/master c:
 cb82a6cdf994d6656ad0a25ed28395af3416a27c h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/fs/compat.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d459759e27db..daa4d0dd615c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ff0c007b2854b9ca4dca3a104ee3e4c146c02d6
+refs/heads/master: cb82a6cdf994d6656ad0a25ed28395af3416a27c
diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c
index ff0bafcff720..cc58a20df57a 100644
--- a/trunk/fs/compat.c
+++ b/trunk/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;