From: Shaun Pereira <spereira@tusc.com.au>
Date: Wed, 22 Mar 2006 08:00:40 +0000 (-0800)
Subject: [X25]: fix kernel error message 64 bit kernel
X-Git-Tag: v2.6.17-rc1~1129^2~3^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bac37ec8300389d355d41a828b47577c1ec2e4f4;p=linux-2.6

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

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index a41cc02017..03725c0517 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;