]> err.no Git - linux-2.6/commitdiff
[X25]: fix kernel error message 64 bit kernel
authorShaun Pereira <spereira@tusc.com.au>
Wed, 22 Mar 2006 08:00:40 +0000 (00:00 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 22 Mar 2006 08:00:40 +0000 (00:00 -0800)
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>
net/x25/af_x25.c

index a41cc0201760f344fcdd79b2f22a716308110c27..03725c05175294732418b62107db627059179a50 100644 (file)
@@ -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;