diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2007-11-24 10:40:36 -0500 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2007-11-24 10:40:36 -0500 |
| commit | ff29eebdcd81ddf0b20e04e8b392c04600594ffa (patch) | |
| tree | 7529154d4894fe5af74fb72c858f79b7269dca30 | |
| parent | 8fe15c1c1fcad3cf69c99f6eed18fddce2ace3cd (diff) | |
| parent | c6bf00e1c6f63656cebac8ee72a3b095d37525c5 (diff) | |
| download | systemtap-steved-ff29eebdcd81ddf0b20e04e8b392c04600594ffa.tar.gz systemtap-steved-ff29eebdcd81ddf0b20e04e8b392c04600594ffa.tar.xz systemtap-steved-ff29eebdcd81ddf0b20e04e8b392c04600594ffa.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
| -rw-r--r-- | tapset/ChangeLog | 6 | ||||
| -rw-r--r-- | tapset/syscalls2.stp | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog index d5b32bf1..49ccfbfa 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,9 @@ +2007-11-21 Zhaolei <zhaolei@cn.fujitsu.com> + + From Bai Weidong <baiwd@cn.fujitsu.com> + * syscalls2.stp (rt_sigsuspend): Fix the semantic error caused by + the difference of kernel versions on IA64. + 2007-11-14 Zhaolei <zhaolei@cn.fujitsu.com> From Lai Jiangshan <laijs@cn.fujitsu.com> diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp index 9c84f23d..7029e09c 100644 --- a/tapset/syscalls2.stp +++ b/tapset/syscalls2.stp @@ -1017,14 +1017,16 @@ probe syscall.rt_sigreturn.return = # probe syscall.rt_sigsuspend = kernel.function("sys_rt_sigsuspend") ?, - kernel.function("compat_sys_rt_sigsuspend") ? + kernel.function("compat_sys_rt_sigsuspend") ?, + kernel.function("ia64_rt_sigsuspend") ? { name = "rt_sigsuspend" argstr = "" } probe syscall.rt_sigsuspend.return = kernel.function("sys_rt_sigsuspend").return ?, - kernel.function("compat_sys_rt_sigsuspend").return ? + kernel.function("compat_sys_rt_sigsuspend").return ?, + kernel.function("ia64_rt_sigsuspend").return ? { name = "rt_sigsuspend" retstr = returnstr(1) |