From 234382d2343b31b95820f8b39394084c3a9337f0 Mon Sep 17 00:00:00 2001
From: Martin Cermak <mcermak@redhat.com>
Date: Tue, 3 Jan 2017 08:47:24 +0100
Subject: [PATCH] PR20333/setsid

---
 tapset/linux/nd_syscalls2.stp | 15 ------------
 tapset/linux/sysc_setsid.stp  | 43 +++++++++++++++++++++++++++++++++++
 tapset/linux/syscalls2.stp    | 15 ------------
 3 files changed, 43 insertions(+), 30 deletions(-)
 create mode 100644 tapset/linux/sysc_setsid.stp

diff --git a/tapset/linux/nd_syscalls2.stp b/tapset/linux/nd_syscalls2.stp
index c960a6253..f2fd8a259 100644
--- a/tapset/linux/nd_syscalls2.stp
+++ b/tapset/linux/nd_syscalls2.stp
@@ -1,19 +1,4 @@
 
-# setsid _____________________________________________________
-#
-# long sys_setsid(void)
-#
-probe nd_syscall.setsid = kprobe.function("sys_setsid")
-{
-	name = "setsid"
-	argstr = ""
-}
-probe nd_syscall.setsid.return = kprobe.function("sys_setsid").return
-{
-	name = "setsid"
-	retstr = returnstr(1)
-}
-
 # setsockopt _________________________________________________
 #
 # long sys_setsockopt(int fd,
diff --git a/tapset/linux/sysc_setsid.stp b/tapset/linux/sysc_setsid.stp
new file mode 100644
index 000000000..fde245be2
--- /dev/null
+++ b/tapset/linux/sysc_setsid.stp
@@ -0,0 +1,43 @@
+# setsid _____________________________________________________
+#
+# long sys_setsid(void)
+#
+
+@define _SYSCALL_SETSID_NAME
+%(
+	name = "setsid"
+%)
+
+@define _SYSCALL_SETSID_ARGSTR
+%(
+	argstr = ""
+%)
+
+probe syscall.setsid = dw_syscall.setsid !, nd_syscall.setsid {}
+probe syscall.setsid.return = dw_syscall.setsid.return !, nd_syscall.setsid.return {}
+
+# dw_setsid _____________________________________________________
+
+probe dw_syscall.setsid = kernel.function("sys_setsid").call
+{
+	@_SYSCALL_SETSID_NAME
+	@_SYSCALL_SETSID_ARGSTR
+}
+probe dw_syscall.setsid.return = kernel.function("sys_setsid").return
+{
+	@_SYSCALL_SETSID_NAME
+	retstr = return_str(1, $return)
+}
+
+# nd_setsid _____________________________________________________
+
+probe nd_syscall.setsid = kprobe.function("sys_setsid")
+{
+	@_SYSCALL_SETSID_NAME
+	@_SYSCALL_SETSID_ARGSTR
+}
+probe nd_syscall.setsid.return = kprobe.function("sys_setsid").return
+{
+	@_SYSCALL_SETSID_NAME
+	retstr = returnstr(1)
+}
diff --git a/tapset/linux/syscalls2.stp b/tapset/linux/syscalls2.stp
index 5b9905a6e..f88e5ed22 100644
--- a/tapset/linux/syscalls2.stp
+++ b/tapset/linux/syscalls2.stp
@@ -1,19 +1,4 @@
 
-# setsid _____________________________________________________
-#
-# long sys_setsid(void)
-#
-probe syscall.setsid = kernel.function("sys_setsid").call
-{
-	name = "setsid"
-	argstr = ""
-}
-probe syscall.setsid.return = kernel.function("sys_setsid").return
-{
-	name = "setsid"
-	retstr = return_str(1, $return)
-}
-
 # setsockopt _________________________________________________
 #
 # long sys_setsockopt(int fd,
-- 
2.43.5