PR20333/sgetmask

diff --git a/tapset/linux/nd_syscalls2.stp b/tapset/linux/nd_syscalls2.stp
index c4589a68b94182423fe178e6855e91bd78b1b351..2c4b276d38c287c9110420902219f0753937fd6a 100644 (file)
--- a/tapset/linux/nd_syscalls2.stp
+++ b/tapset/linux/nd_syscalls2.stp
@@ -1,19 +1,4 @@
 
-# sgetmask ___________________________________________________
-#
-# sys_sgetmask(void)
-#
-probe nd_syscall.sgetmask = kprobe.function("sys_sgetmask") ?
-{
-       name = "sgetmask"
-       argstr = ""
-}
-probe nd_syscall.sgetmask.return = kprobe.function("sys_sgetmask").return ?
-{
-       name = "sgetmask"
-       retstr = returnstr(1)
-}
-
 # shmat ______________________________________________________
 #
 # long sys_shmat(int shmid, char __user *shmaddr, int shmflg)

diff --git a/tapset/linux/sysc_sgetmask.stp b/tapset/linux/sysc_sgetmask.stp
new file mode 100644 (file)
index 0000000..1338865
--- /dev/null
+++ b/tapset/linux/sysc_sgetmask.stp
@@ -0,0 +1,44 @@
+# sgetmask ___________________________________________________
+#
+# sys_sgetmask(void)
+#
+
+@define _SYSCALL_SGETMASK_NAME
+%(
+       name = "sgetmask"
+%)
+
+@define _SYSCALL_SGETMASK_ARGSTR
+%(
+       argstr = ""
+%)
+
+probe syscall.sgetmask = dw_syscall.sgetmask !, nd_syscall.sgetmask {}
+probe syscall.sgetmask.return = dw_syscall.sgetmask.return !,
+                                nd_syscall.sgetmask.return {}
+
+# dw_sgetmask _____________________________________________________
+
+probe dw_syscall.sgetmask = kernel.function("sys_sgetmask").call ?
+{
+       @_SYSCALL_SGETMASK_NAME
+       @_SYSCALL_SGETMASK_ARGSTR
+}
+probe dw_syscall.sgetmask.return = kernel.function("sys_sgetmask").return ?
+{
+       @_SYSCALL_SGETMASK_NAME
+       retstr = return_str(1, $return)
+}
+
+# nd_sgetmask _____________________________________________________
+
+probe nd_syscall.sgetmask = kprobe.function("sys_sgetmask") ?
+{
+       @_SYSCALL_SGETMASK_NAME
+       @_SYSCALL_SGETMASK_ARGSTR
+}
+probe nd_syscall.sgetmask.return = kprobe.function("sys_sgetmask").return ?
+{
+       @_SYSCALL_SGETMASK_NAME
+       retstr = returnstr(1)
+}

diff --git a/tapset/linux/syscalls2.stp b/tapset/linux/syscalls2.stp
index df998acc4eb9f087642dcd47532e1c46736f08e5..0b136e3649e0f67770896e5ac06de07be97b980a 100644 (file)
--- a/tapset/linux/syscalls2.stp
+++ b/tapset/linux/syscalls2.stp
@@ -1,17 +1,3 @@
-# sgetmask ___________________________________________________
-#
-# sys_sgetmask(void)
-#
-probe syscall.sgetmask = kernel.function("sys_sgetmask").call ?
-{
-       name = "sgetmask"
-       argstr = ""
-}
-probe syscall.sgetmask.return = kernel.function("sys_sgetmask").return ?
-{
-       name = "sgetmask"
-       retstr = return_str(1, $return)
-}
 
 # shmat ______________________________________________________
 #