summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorShaun Pereira <spereira@tusc.com.au>2006-03-22 00:00:40 -0800
committerDavid S. Miller <davem@davemloft.net>2006-03-22 00:00:40 -0800
commitbac37ec8300389d355d41a828b47577c1ec2e4f4 (patch)
tree57d692d61de5b52e61883f1f9a2aa2a3ffa6c79d /net
parent1b06e6ba25a37fe1c289049d0e0300d71ae39eff (diff)
downloadlinux-3.10-bac37ec8300389d355d41a828b47577c1ec2e4f4.tar.gz
linux-3.10-bac37ec8300389d355d41a828b47577c1ec2e4f4.tar.bz2
linux-3.10-bac37ec8300389d355d41a828b47577c1ec2e4f4.zip
[X25]: fix kernel error message 64 bit kernel
Fixes the following error from kernel T2 kernel: schedule_timeout: wrong timeout value ffffffffffffffff from ffffffff88164796 Signed-off-by: Shaun Pereira <spereira@tusc.com.au> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/x25/af_x25.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index a41cc020176..03725c05175 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -744,7 +744,7 @@ out:
return rc;
}
-static int x25_wait_for_data(struct sock *sk, int timeout)
+static int x25_wait_for_data(struct sock *sk, long timeout)
{
DECLARE_WAITQUEUE(wait, current);
int rc = 0;