PR20333/tux

diff --git a/tapset/linux/nd_syscalls2.stp b/tapset/linux/nd_syscalls2.stp
index 24f3885a2d950a6af2c83ea5644c5e6189135177..8441c5ff0107671e988e4b31e9cc05df97a7ba48 100644 (file)
--- a/tapset/linux/nd_syscalls2.stp
+++ b/tapset/linux/nd_syscalls2.stp
@@ -1,21 +1,4 @@
 
-# tux ________________________________________________________
-# long sys_tux (unsigned int action, user_req_t *u_info)
-#
-probe nd_syscall.tux = kprobe.function("sys_tux") ?
-{
-       name = "tux"
-       asmlinkage()
-       action = uint_arg(1)
-       u_info_uaddr = pointer_arg(2)
-       argstr = sprintf("%d, %p", action, u_info_uaddr)
-}
-probe nd_syscall.tux.return = kprobe.function("sys_tux").return ?
-{
-       name = "tux"
-       retstr = returnstr(1)
-}
-
 # umask ______________________________________________________
 # long sys_umask(int mask)
 #

diff --git a/tapset/linux/sysc_tux.stp b/tapset/linux/sysc_tux.stp
new file mode 100644 (file)
index 0000000..282a073
--- /dev/null
+++ b/tapset/linux/sysc_tux.stp
@@ -0,0 +1,47 @@
+# tux ________________________________________________________
+# long sys_tux (unsigned int action, user_req_t *u_info)
+#
+
+@define _SYSCALL_TUX_NAME
+%(
+       name = "tux"
+%)
+
+@define _SYSCALL_TUX_ARGSTR
+%(
+       argstr = sprintf("%d, %p", action, u_info_uaddr)
+%)
+
+probe syscall.tux = dw_syscall.tux !, nd_syscall.tux {}
+probe syscall.tux.return = dw_syscall.tux.return !, nd_syscall.tux.return {}
+
+# dw_tux _____________________________________________________
+
+probe dw_syscall.tux = kernel.function("sys_tux").call ?
+{
+       @_SYSCALL_TUX_NAME
+       action = $action
+       u_info_uaddr = $u_info
+       @_SYSCALL_TUX_ARGSTR
+}
+probe dw_syscall.tux.return = kernel.function("sys_tux").return ?
+{
+       @_SYSCALL_TUX_NAME
+       retstr = return_str(1, $return)
+}
+
+# nd_tux _____________________________________________________
+
+probe nd_syscall.tux = kprobe.function("sys_tux") ?
+{
+       @_SYSCALL_TUX_NAME
+       asmlinkage()
+       action = uint_arg(1)
+       u_info_uaddr = pointer_arg(2)
+       @_SYSCALL_TUX_ARGSTR
+}
+probe nd_syscall.tux.return = kprobe.function("sys_tux").return ?
+{
+       @_SYSCALL_TUX_NAME
+       retstr = returnstr(1)
+}

diff --git a/tapset/linux/syscalls2.stp b/tapset/linux/syscalls2.stp
index 658671468e2bd4bed69713886a0224c201dc4ca7..ed378549ea5229b9dd31a5acb23f7013fe8678c3 100644 (file)
--- a/tapset/linux/syscalls2.stp
+++ b/tapset/linux/syscalls2.stp
@@ -1,20 +1,4 @@
 
-# tux ________________________________________________________
-# long sys_tux (unsigned int action, user_req_t *u_info)
-#
-probe syscall.tux = kernel.function("sys_tux").call ?
-{
-       name = "tux"
-       action = $action
-       u_info_uaddr = $u_info
-       argstr = sprintf("%d, %p", $action, $u_info)
-}
-probe syscall.tux.return = kernel.function("sys_tux").return ?
-{
-       name = "tux"
-       retstr = return_str(1, $return)
-}
-
 # umask ______________________________________________________
 # long sys_umask(int mask)
 #