diff options
-rw-r--r-- | tapset/ChangeLog | 8 | ||||
-rw-r--r-- | tapset/nfs_proc.stp | 2 | ||||
-rw-r--r-- | tapset/socket.stp | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog index feabc0bf..a1cf0132 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,5 +1,13 @@ 2007-09-25 Frank Ch. Eigler <fche@elastic.org> + * socket.stp (sock_flags_num2str): Define SOCK_PASSCRED if needed. + +2007-09-25 Frank Ch. Eigler <fche@elastic.org> + + * nfs_proc.stp (__i2n_ip_proto): Add a cast for 32-bit compatibility. + +2007-09-25 Frank Ch. Eigler <fche@elastic.org> + * signal.stp (_signal.send.part*): Remove sinfo alias variable, since it's a struct rather than integral value. 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*/ 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 |