[PATCH 4/4]x25: 32 bit (socket layer) ioctl emulation for 64 bit kernels

Shaun Pereira
2006-01-16T23:14:05Z

A small fix for the following error, when trying to run a 64 bit x25
server application.

T2 kernel: schedule_timeout:
wrong timeout value ffffffffffffffff from ffffffff88164796

diff -uprN -X dontdiff linux-2.6.15-vanilla/net/x25/af_x25.c
linux-2.6.15/net/x25/af_x25.c
--- linux-2.6.15-vanilla/net/x25/af_x25.c 2006-01-17 09:57:38.000000000
+1100
+++ linux-2.6.15/net/x25/af_x25.c 2006-01-17 09:58:04.000000000 +1100
@@ -747,7 +747,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;