From 14132a5eb855778cfe855256ff024b05a01cc9fb Mon Sep 17 00:00:00 2001 From: fche Date: Tue, 25 Sep 2007 19:22:29 +0000 Subject: * build fix on rhel4 2007-09-25 Frank Ch. Eigler * socket.stp (__i2n_ip_proto): Add a cast for 32-bit compatibility. --- tapset/ChangeLog | 4 ++++ tapset/nfs_proc.stp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tapset/ChangeLog b/tapset/ChangeLog index feabc0bf..5cd5a6d5 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,7 @@ +2007-09-25 Frank Ch. Eigler + + * socket.stp (__i2n_ip_proto): Add a cast for 32-bit compatibility. + 2007-09-25 Frank Ch. Eigler * signal.stp (_signal.send.part*): Remove sinfo alias variable, diff --git a/tapset/nfs_proc.stp b/tapset/nfs_proc.stp index dd46544f..3ccd016b 100644 --- a/tapset/nfs_proc.stp +++ b/tapset/nfs_proc.stp @@ -41,7 +41,7 @@ */ function __i2n_ip_proto :long(dir:long,index:long) %{ /* pure */ int index = (int) (THIS->index); - struct inode * dir = (struct inode *)(THIS->dir); + struct inode * dir = (struct inode *)(uintptr_t)(THIS->dir); struct rpc_clnt * clnt = NFS_CLIENT(dir); /* FIXME: deref hazard! */ struct rpc_xprt * cl_xprt = kread(&(clnt->cl_xprt)); /* sockaddr_storage is used since 2.6.19. Need cast*/ -- cgit From aef736c8d2f96fa012f17f27ed57330cc3f4524f Mon Sep 17 00:00:00 2001 From: fche Date: Tue, 25 Sep 2007 19:30:58 +0000 Subject: socket.stp build fix for 2.6.9 kernel 2007-09-25 Frank Ch. Eigler * socket.stp (sock_flags_num2str): Define SOCK_PASSCRED if needed. --- tapset/ChangeLog | 4 ++++ tapset/socket.stp | 3 +++ 2 files changed, 7 insertions(+) diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 5cd5a6d5..48b6b86e 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,7 @@ +2007-09-25 Frank Ch. Eigler + + * socket.stp (sock_flags_num2str): Define SOCK_PASSCRED if needed. + 2007-09-25 Frank Ch. Eigler * socket.stp (__i2n_ip_proto): Add a cast for 32-bit compatibility. diff --git a/tapset/socket.stp b/tapset/socket.stp index 563b866b..fc532b1d 100644 --- a/tapset/socket.stp +++ b/tapset/socket.stp @@ -626,6 +626,9 @@ function sock_type_str2num:long (type:string) function sock_flags_num2str:string (flags:long) %{ /* pure */ +#ifndef SOCK_PASSCRED +#define SOCK_PASSCRED 3 /* introduced in 2.6.12? */ +#endif #ifndef SOCK_PASSSEC #define SOCK_PASSSEC 4 /* introduced in 2.6.18 */ #endif -- cgit From 4e6cc599843a7abbe22518b25428167558facc30 Mon Sep 17 00:00:00 2001 From: fche Date: Tue, 25 Sep 2007 19:31:32 +0000 Subject: typo fix --- tapset/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 48b6b86e..a1cf0132 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -4,7 +4,7 @@ 2007-09-25 Frank Ch. Eigler - * socket.stp (__i2n_ip_proto): Add a cast for 32-bit compatibility. + * nfs_proc.stp (__i2n_ip_proto): Add a cast for 32-bit compatibility. 2007-09-25 Frank Ch. Eigler -- cgit