diff options
author | Shaun Pereira <spereira@tusc.com.au> | 2006-03-22 03:00:40 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-03-22 03:00:40 -0500 |
commit | bac37ec8300389d355d41a828b47577c1ec2e4f4 (patch) | |
tree | 57d692d61de5b52e61883f1f9a2aa2a3ffa6c79d /net | |
parent | 1b06e6ba25a37fe1c289049d0e0300d71ae39eff (diff) |
[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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index a41cc0201760..03725c051752 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c | |||
@@ -744,7 +744,7 @@ out: | |||
744 | return rc; | 744 | return rc; |
745 | } | 745 | } |
746 | 746 | ||
747 | static int x25_wait_for_data(struct sock *sk, int timeout) | 747 | static int x25_wait_for_data(struct sock *sk, long timeout) |
748 | { | 748 | { |
749 | DECLARE_WAITQUEUE(wait, current); | 749 | DECLARE_WAITQUEUE(wait, current); |
750 | int rc = 0; | 750 | int rc = 0; |