diff options
author | David Smith <dsmith@redhat.com> | 2009-06-11 16:29:13 -0500 |
---|---|---|
committer | David Smith <dsmith@redhat.com> | 2009-06-11 16:29:13 -0500 |
commit | 5dce84d4fe74644ef76004ff0402510b289a2778 (patch) | |
tree | 613deb4149bdfee88f48cc28d7a4b124946e5777 /tapset/context.stp | |
parent | 43229357282fd51eb1a3c7742932068873c27270 (diff) | |
parent | 749269040630f0f250f431a258e7967f54dc9a5c (diff) | |
download | systemtap-steved-5dce84d4fe74644ef76004ff0402510b289a2778.tar.gz systemtap-steved-5dce84d4fe74644ef76004ff0402510b289a2778.tar.xz systemtap-steved-5dce84d4fe74644ef76004ff0402510b289a2778.zip |
Merge commit 'origin/master' into pr7043
Diffstat (limited to 'tapset/context.stp')
-rw-r--r-- | tapset/context.stp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tapset/context.stp b/tapset/context.stp index 5d855f80..468421ae 100644 --- a/tapset/context.stp +++ b/tapset/context.stp @@ -70,9 +70,13 @@ function ppid:long () %{ /* pure */ * leader. Session ID is stored in the signal_struct since Kernel 2.6.0. */ function sid:long () %{ /* pure */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) struct signal_struct *ss = kread( &(current->signal) ); THIS->__retvalue = kread ( &(ss->session) ); CATCH_DEREF_FAULT(); +#else + THIS->__retvalue = task_session_nr_ns(current, &init_pid_ns); +#endif %} /** |