6 files changed, 55 insertions, 21 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index 298156f6..93beb971 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,7 +1,10 @@
 2007-07-31  Martin Hunt  <hunt@redhat.com>
 
-	* syscalls.stp (clack_nanosleep): Fix flags string.
+	* syscalls*: Move sys32_sysctl to arch dirs.
+	
+2007-07-31  Martin Hunt  <hunt@redhat.com>
 
+	* syscalls.stp (clock_nanosleep): Fix flags string.
 	* syscalls2.stp: Fix typo.
 
 2007-07-31  Martin Hunt  <hunt@redhat.com>	
diff --git a/tapset/ia64/syscalls.stp b/tapset/ia64/syscalls.stp
index 2a281471..beb8222a 100644
--- a/tapset/ia64/syscalls.stp
+++ b/tapset/ia64/syscalls.stp
@@ -41,3 +41,15 @@ probe syscall.mmap2.return = kernel.function("sys_mmap2").return ?
         retstr = returnstr(2)
 }
 
+# sysctl _____________________________________________________
+#
+# long sys32_sysctl (struct sysctl32 __user *args)
+#
+probe syscall.sysctl32 = kernel.function("sys32_sysctl") ? {
+	name = "sysctl"
+	argstr = sprintf("%p", $args)
+}
+probe syscall.sysctl32.return = kernel.function("sys32_sysctl").return ? {
+	name = "sysctl"
+	retstr = returnstr(1)
+}
diff --git a/tapset/ppc64/syscalls.stp b/tapset/ppc64/syscalls.stp
index 7e7ad3c9..c6396b7e 100644
--- a/tapset/ppc64/syscalls.stp
+++ b/tapset/ppc64/syscalls.stp
@@ -526,7 +526,7 @@ probe syscall.sys32_adjtimex = kernel.function("sys32_adjtimex") ? {
 	name = "sys32_adjtimex"
 	argstr = sprintf("%p", $utp)
 }
-probe syscall.sys32_adjtimex.return = kernel.function("sys32_adjtimex").return ?{
+probe syscall.sys32_adjtimex.return = kernel.function("sys32_adjtimex").return ? {
 	name = "sys32_adjtimex"
 	retstr = returnstr(1)
 }
@@ -549,20 +549,20 @@ probe syscall.sys32_getdents.return =
 	name = "sys32_getdents"
 	retstr = returnstr(1)
 }
-# sys32_sysctl ________________________________________
+
+# compat_sys_sysctl ________________________________________
 #
-# asmlinkage long sys32_sysctl(struct __sysctl_args32 __user *args)
+# long compat_sys_sysctl(struct __sysctl_args32 __user *args)
 #
-probe syscall.sys32_sysctl = kernel.function("sys32_sysctl") ? {
-	name = "sys32_sysctl"
-	args_uaddr = $args
-	argstr = sprintf("%p", args_uaddr)
+probe syscall.compat_sysctl = kernel.function("compat_sys_sysctl") ? {
+	name = "sysctl"
+	argstr = sprintf("%p", $args)
 }
-probe syscall.sys32_sysctl.return =
-	kernel.function("sys32_sysctl").return ? {
-	name = "sys32_sysctl"
+probe syscall.compat_sysctl.return = kernel.function("compat_sys_sysctl").return ? {
+	name = "sysctl"
 	retstr = returnstr(1)
 }
+
 # sys32_sched_setparam ________________________________________
 #
 # asmlinkage long sys32_sched_setparam(u32 pid,
diff --git a/tapset/s390x/syscalls.stp b/tapset/s390x/syscalls.stp
index 40a73fd5..a544e463 100644
--- a/tapset/s390x/syscalls.stp
+++ b/tapset/s390x/syscalls.stp
@@ -87,6 +87,19 @@ probe syscall.mmap2.return = kernel.function("sys_mmap2").return,
         retstr = returnstr(2)
 }
 
+# sysctl _____________________________________________________
+#
+# long sys32_sysctl(struct __sysctl_args32 __user *args)
+#
+probe syscall.sysctl32 = kernel.function("sys32_sysctl") ? {
+	name = "sysctl"
+	argstr = sprintf("%p", $args)
+}
+probe syscall.sysctl32.return = kernel.function("sys32_sysctl").return ? {
+	name = "sysctl"
+	retstr = returnstr(1)
+}
+
 function get_mmap_args:string (args:long)
 %{
 	struct mmap_arg_struct {
diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index ec400a22..d208b45c 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -2374,7 +2374,6 @@ probe syscall.symlink.return = kernel.function("sys_symlink").return {
 }
 # sync _______________________________________________________
 #
-# asmlinkage long
 # sys_sync(void)
 #
 probe syscall.sync = kernel.function("sys_sync") {
@@ -2385,22 +2384,16 @@ probe syscall.sync.return = kernel.function("sys_sync").return {
 	name = "sync"
 	retstr = returnstr(1)
 }
+
 # sysctl _____________________________________________________
 #
 # long sys_sysctl(struct __sysctl_args __user *args)
-# long sys32_sysctl(struct __sysctl_args32 __user *args)
 #
-probe syscall.sysctl =
-		kernel.function("sys_sysctl"), 
-		kernel.function("sys32_sysctl") ?
-{
+probe syscall.sysctl = kernel.function("sys_sysctl") ? {
 	name = "sysctl"
 	argstr = sprintf("%p", $args)
 }
-probe syscall.sysctl.return =
-		kernel.function("sys_sysctl").return,
-		kernel.function("sys32_sysctl").return ?
-{
+probe syscall.sysctl.return = kernel.function("sys_sysctl").return ? {
 	name = "sysctl"
 	retstr = returnstr(1)
 }
diff --git a/tapset/x86_64/syscalls.stp b/tapset/x86_64/syscalls.stp
index de070a7d..32a43cc1 100644
--- a/tapset/x86_64/syscalls.stp
+++ b/tapset/x86_64/syscalls.stp
@@ -49,6 +49,19 @@ probe syscall.sigaltstack.return = kernel.function("sys_sigaltstack").return {
 	retstr = returnstr(1)
 }
 
+# sysctl _____________________________________________________
+#
+# long sys32_sysctl(struct sysctl_ia32 __user *args32)
+#
+probe syscall.sysctl32 = kernel.function("sys32_sysctl") ? {
+	name = "sysctl"
+	argstr = sprintf("%p", $args32)
+}
+probe syscall.sysctl32.return = kernel.function("sys32_sysctl").return ? {
+	name = "sysctl"
+	retstr = returnstr(1)
+}
+
 # mmap
 # long sys_mmap(unsigned long addr, unsigned long len,
 #          unsigned long prot, unsigned long flags,