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

From: Shaun Pereira
Date: Mon Jan 16 2006 - 18:12:41 EST


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;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/