From cfcb2281723313124c39924c3c20a476844a0592 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Tue, 2 Jun 2009 16:59:59 -0700
Subject: [PATCH] Clean up the formatting of $arch/syscalls.stp

---
 tapset/i686/syscalls.stp   |  59 ++++++----
 tapset/ia64/syscalls.stp   |  14 ++-
 tapset/ppc64/syscalls.stp  | 218 ++++++++++++++++++++++---------------
 tapset/s390x/syscalls.stp  |  28 +++--
 tapset/x86_64/syscalls.stp |  54 ++++++---
 5 files changed, 224 insertions(+), 149 deletions(-)

diff --git a/tapset/i686/syscalls.stp b/tapset/i686/syscalls.stp
index 2a89c19db..dec0aa977 100644
--- a/tapset/i686/syscalls.stp
+++ b/tapset/i686/syscalls.stp
@@ -7,13 +7,14 @@
  * asmlinkage int
  * sys_get_thread_area(struct user_desc __user *u_info)
  */
-probe syscall.get_thread_area = kernel.function("sys_get_thread_area") {
+probe syscall.get_thread_area = kernel.function("sys_get_thread_area")
+{
 	name = "get_thread_area"
 	u_info_uaddr = $u_info
 	argstr = sprintf("%p", u_info_uaddr)
 }
-probe syscall.get_thread_area.return =
-	kernel.function("sys_get_thread_area").return {
+probe syscall.get_thread_area.return = kernel.function("sys_get_thread_area").return
+{
 	name = "get_thread_area"
 	retstr = returnstr(1)
 }
@@ -22,11 +23,13 @@ probe syscall.get_thread_area.return =
 # NOTE. This function is only in i386 and x86_64 and its args vary
 # between those two archs.
 #
-probe syscall.iopl = kernel.function("sys_iopl") {
+probe syscall.iopl = kernel.function("sys_iopl")
+{
 	name = "iopl"
 	argstr = ""
 }
-probe syscall.iopl.return = kernel.function("sys_iopl").return {
+probe syscall.iopl.return = kernel.function("sys_iopl").return
+{
 	name = "iopl"
 	retstr = returnstr(1)
 }
@@ -34,7 +37,8 @@ probe syscall.iopl.return = kernel.function("sys_iopl").return {
 # ipc ________________________________________________________
 #  int sys_ipc (uint call, int first, int second, int third, void __user *ptr, long fifth)
 #
-probe syscall.ipc = kernel.function("sys_ipc") ? {
+probe syscall.ipc = kernel.function("sys_ipc") ?
+{
 	name = "ipc"
 	call = $call
 	first = $first
@@ -45,7 +49,8 @@ probe syscall.ipc = kernel.function("sys_ipc") ? {
 	argstr = sprintf("%d, %d, %d, %d, %p, %d", $call, $first,
 			$second, $third, $ptr, $fifth)
 }
-probe syscall.ipc.return = kernel.function("sys_ipc").return ? {
+probe syscall.ipc.return = kernel.function("sys_ipc").return ?
+{
 	name = "ipc"
 	retstr = returnstr(1)
 }
@@ -65,7 +70,7 @@ probe syscall.mmap2 = kernel.function("sys_mmap2") ?
         flags = $flags
         fd = $fd
         pgoffset = $pgoff
-        argstr = sprintf("%p, %d, %s, %s, %d, %d", $addr, 
+        argstr = sprintf("%p, %d, %s, %s, %d, %d", $addr,
                 $len, _mprotect_prot_str($prot), _mmap_flags($flags),
                 $fd, $pgoff)
 }
@@ -80,14 +85,14 @@ probe syscall.mmap2.return = kernel.function("sys_mmap2").return ?
  * asmlinkage int
  * sys_set_thread_area(struct user_desc __user *u_info)
  */
-probe syscall.set_thread_area =
-	kernel.function("sys_set_thread_area") {
+probe syscall.set_thread_area = kernel.function("sys_set_thread_area")
+{
 	name = "set_thread_area"
 	u_info_uaddr = $u_info
 	argstr = sprintf("%p", u_info_uaddr)
 }
-probe syscall.set_thread_area.return =
-	kernel.function("sys_set_thread_area").return {
+probe syscall.set_thread_area.return = kernel.function("sys_set_thread_area").return
+{
 	name = "set_thread_area"
 	retstr = returnstr(1)
 }
@@ -98,16 +103,16 @@ probe syscall.set_thread_area.return =
  *                      unsigned int zone,
  *                      unsigned int state)
  */
-probe syscall.set_zone_reclaim =
-	kernel.function("sys_set_zone_reclaim") ? {
+probe syscall.set_zone_reclaim = kernel.function("sys_set_zone_reclaim") ?
+{
 	name = "set_zone_reclaim"
 	node = $node
 	zone = $zone
 	state = $state
 	argstr = sprintf("%d, %d, %d", $node, $zone, $state)
 }
-probe syscall.set_zone_reclaim.return =
-	kernel.function("sys_set_zone_reclaim").return ? {
+probe syscall.set_zone_reclaim.return = kernel.function("sys_set_zone_reclaim").return ?
+{
 	name = "set_zone_reclaim"
 	retstr = returnstr(1)
 }
@@ -117,12 +122,14 @@ probe syscall.set_zone_reclaim.return =
 #
 # NOTE: args vary between archs.
 #
-probe syscall.sigaltstack = kernel.function("sys_sigaltstack") {
+probe syscall.sigaltstack = kernel.function("sys_sigaltstack")
+{
 	name = "sigaltstack"
 	ussp = %( kernel_vr < "2.6.25" %? $ebx %: %( kernel_vr < "2.6.29" %? $bx %: $regs->bx %) %)
 	argstr = sprintf("%p", ussp)
 }
-probe syscall.sigaltstack.return = kernel.function("sys_sigaltstack").return {
+probe syscall.sigaltstack.return = kernel.function("sys_sigaltstack").return
+{
 	name = "sigaltstack"
 	retstr = returnstr(1)
 }
@@ -131,7 +138,8 @@ probe syscall.sigaltstack.return = kernel.function("sys_sigaltstack").return {
 #
 # int sys_vm86(struct pt_regs regs)
 #
-probe syscall.vm86 = kernel.function("sys_vm86") ? {
+probe syscall.vm86 = kernel.function("sys_vm86") ?
+{
 	name = "vm86"
       /*
        * unsupported type identifier '$regs'
@@ -139,8 +147,9 @@ probe syscall.vm86 = kernel.function("sys_vm86") ? {
        */
 	argstr = ""
 }
-probe syscall.vm86.return = kernel.function("sys_vm86").return ? {
-	name = "vm86"	
+probe syscall.vm86.return = kernel.function("sys_vm86").return ?
+{
+	name = "vm86"
 	retstr = returnstr(1)
 }
 
@@ -148,15 +157,17 @@ probe syscall.vm86.return = kernel.function("sys_vm86").return ? {
 #
 # int sys_vm86old(struct pt_regs regs)
 #
-probe syscall.vm86old = kernel.function("sys_vm86old") ? {
-	name = "vm86old"	
+probe syscall.vm86old = kernel.function("sys_vm86old") ?
+{
+	name = "vm86old"
       /*
        * unsupported type identifier '$regs'
        * regs = $regs
        */
 	argstr = ""
 }
-probe syscall.vm86old.return = kernel.function("sys_vm86old").return ? {
+probe syscall.vm86old.return = kernel.function("sys_vm86old").return ?
+{
 	name = "vm86old"
 	retstr = returnstr(1)
 }
diff --git a/tapset/ia64/syscalls.stp b/tapset/ia64/syscalls.stp
index 7a508071d..c57ab7e69 100644
--- a/tapset/ia64/syscalls.stp
+++ b/tapset/ia64/syscalls.stp
@@ -3,7 +3,8 @@
 # mmap
 # sys_mmap (unsigned long addr, unsigned long len, int prot, int flags, int fd, long off)
 #
-probe syscall.mmap = kernel.function("sys_mmap") ? {
+probe syscall.mmap = kernel.function("sys_mmap") ?
+{
         name = "mmap"
         start = $addr
         len = $len
@@ -15,7 +16,8 @@ probe syscall.mmap = kernel.function("sys_mmap") ? {
                 _mprotect_prot_str($prot), _mmap_flags($flags), $fd, $off)
 }
 
-probe syscall.mmap.return = kernel.function("sys_mmap").return ? {
+probe syscall.mmap.return = kernel.function("sys_mmap").return ?
+{
         name = "mmap"
         retstr = returnstr(2)
 }
@@ -31,7 +33,7 @@ probe syscall.mmap2 = kernel.function("sys_mmap2") ?
         flags = $flags
         fd = $fd
         pgoffset = $pgoff
-        argstr = sprintf("%p, %d, %s, %s, %d, %d", $addr, 
+        argstr = sprintf("%p, %d, %s, %s, %d, %d", $addr,
                 $len, _mprotect_prot_str($prot), _mmap_flags($flags),
                 $fd, $pgoff)
 }
@@ -64,11 +66,13 @@ probe syscall.sigaltstack.return = kernel.function("sys_sigaltstack").return
 #
 # long sys32_sysctl (struct sysctl32 __user *args)
 #
-probe syscall.sysctl32 = kernel.function("sys32_sysctl") ? {
+probe syscall.sysctl32 = kernel.function("sys32_sysctl") ?
+{
 	name = "sysctl"
 	argstr = sprintf("%p", $args)
 }
-probe syscall.sysctl32.return = kernel.function("sys32_sysctl").return ? {
+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 09c715c9e..0518d4860 100644
--- a/tapset/ppc64/syscalls.stp
+++ b/tapset/ppc64/syscalls.stp
@@ -4,11 +4,13 @@
 #
 # time_t sys64_time(time_t __user * tloc)
 #
-probe syscall.sys64_time = kernel.function("sys64_time") ? {
+probe syscall.sys64_time = kernel.function("sys64_time") ?
+{
 	name = "sys64_time"
 	argstr = sprintf("%p", $tloc)
 }
-probe syscall.sys64_time.return = kernel.function("sys64_time").return ? {
+probe syscall.sys64_time.return = kernel.function("sys64_time").return ?
+{
 	name = "sys64_time"
 	retstr = returnstr(1)
 }
@@ -17,12 +19,14 @@ probe syscall.sys64_time.return = kernel.function("sys64_time").return ? {
 #
 # long ppc64_personality(unsigned long personality)
 #
-probe syscall.ppc64_personality = kernel.function("ppc64_personality") {
+probe syscall.ppc64_personality = kernel.function("ppc64_personality")
+{
 	name = "ppc64_personality"
 	persona = $personality
 	argstr = sprint($personality)
 }
-probe syscall.ppc64_personality.return = kernel.function("ppc64_personality").return {
+probe syscall.ppc64_personality.return = kernel.function("ppc64_personality").return
+{
 	name = "ppc64_personality"
 	retstr = returnstr(1)
 }
@@ -31,12 +35,14 @@ probe syscall.ppc64_personality.return = kernel.function("ppc64_personality").re
 #
 # int ppc_rtas(struct rtas_args __user *uargs)
 #
-probe syscall.ppc_rtas = kernel.function("ppc_rtas") ? {
+probe syscall.ppc_rtas = kernel.function("ppc_rtas") ?
+{
 	name = "ppc_rtas"
 	uargs_uaddr = $uargs
 	argstr = sprintf("%p", $uargs)
 }
-probe syscall.ppc_rtas.return = kernel.function("ppc_rtas").return ? {
+probe syscall.ppc_rtas.return = kernel.function("ppc_rtas").return ?
+{
 	name = "ppc_rtas"
 	retstr = returnstr(1)
 }
@@ -45,12 +51,14 @@ probe syscall.ppc_rtas.return = kernel.function("ppc_rtas").return ? {
 #
 # long ppc64_sys32_stime(int __user * tptr)
 #
-probe syscall.ppc64_sys32_stime = kernel.function("ppc64_sys32_stime") ? {
+probe syscall.ppc64_sys32_stime = kernel.function("ppc64_sys32_stime") ?
+{
 	name = "ppc64_sys32_stime"
 	t_uaddr = $tptr
 	argstr = sprintf("%p", $tptr)
 }
-probe syscall.ppc64_sys32_stime.return = kernel.function("ppc64_sys32_stime").return ? {
+probe syscall.ppc64_sys32_stime.return = kernel.function("ppc64_sys32_stime").return ?
+{
 	name = "ppc64_sys32_stime"
 	retstr = returnstr(1)
 }
@@ -60,7 +68,8 @@ probe syscall.ppc64_sys32_stime.return = kernel.function("ppc64_sys32_stime").re
 # int sys32_ptrace(long request, long pid, unsigned long addr,
 #		unsigned long data)
 #
-probe syscall.sys32_ptrace = kernel.function("sys32_ptrace") ? {
+probe syscall.sys32_ptrace = kernel.function("sys32_ptrace") ?
+{
 	name = "sys32_ptrace"
 	request = $request
 	pid = $pid
@@ -68,7 +77,8 @@ probe syscall.sys32_ptrace = kernel.function("sys32_ptrace") ? {
 	data = $data
 	argstr = sprintf("%p, %p, %p, %p", $request, $pid, $addr, $data)
 }
-probe syscall.sys32_ptrace.return = kernel.function("sys32_ptrace").return ? {
+probe syscall.sys32_ptrace.return = kernel.function("sys32_ptrace").return ?
+{
 	name = "sys32_ptrace"
 	retstr = returnstr(1)
 }
@@ -77,12 +87,14 @@ probe syscall.sys32_ptrace.return = kernel.function("sys32_ptrace").return ? {
 #
 # (obsolete) long sys32_sysinfo(struct sysinfo32 __user *info)
 #
-probe syscall.sys32_sysinfo = kernel.function("sys32_sysinfo") ? {
+probe syscall.sys32_sysinfo = kernel.function("sys32_sysinfo") ?
+{
 	name = "sys32_sysinfo"
 	info_uaddr = $info
 	argstr = sprintf("%p", info_uaddr)
 }
-probe syscall.sys32_sysinfo.return = kernel.function("sys32_sysinfo").return ? {
+probe syscall.sys32_sysinfo.return = kernel.function("sys32_sysinfo").return ?
+{
 	name = "sys32_sysinfo"
 	retstr = returnstr(1)
 }
@@ -92,12 +104,14 @@ probe syscall.sys32_sysinfo.return = kernel.function("sys32_sysinfo").return ? {
 # long sys32_ipc(u32 call, u32 first, u32 second, u32 third,
 #			compat_uptr_t ptr, u32 fifth)
 #
-probe syscall.ipc = kernel.function("sys32_ipc") ? {
+probe syscall.ipc = kernel.function("sys32_ipc") ?
+{
 	name = "ipc"
 	argstr = sprintf("%d, %d, %d, %d, %p, %d", $call, $first, $second,
-				$third, $ptr, $fifth) 
+				$third, $ptr, $fifth)
 }
-probe syscall.ipc.return = kernel.function("sys32_ipc").return ? {
+probe syscall.ipc.return = kernel.function("sys32_ipc").return ?
+{
 	name = "sys_ipc"
 	retstr = returnstr(1)
 }
@@ -107,7 +121,8 @@ probe syscall.ipc.return = kernel.function("sys32_ipc").return ? {
 # long sys32_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
 #			struct pt_regs *regs)
 #
-probe syscall.sys32_sigreturn = kernel.function("sys32_sigreturn") ? {
+probe syscall.sys32_sigreturn = kernel.function("sys32_sigreturn") ?
+{
 	name = "sys32_sigreturn"
 	r3 = $r3
 	r4 = $r4
@@ -118,8 +133,8 @@ probe syscall.sys32_sigreturn = kernel.function("sys32_sigreturn") ? {
 	argstr = sprintf("%p, %p, %p, %p, %p, %p",
 				 $r3, $r4, $r5, $r6, $r7, $r8)
 }
-probe syscall.sys32_sigreturn.return =
-	kernel.function("sys32_sigreturn").return ? {
+probe syscall.sys32_sigreturn.return = kernel.function("sys32_sigreturn").return ?
+{
 	name = "sys32_sigreturn"
 	retstr = returnstr(1)
 }
@@ -127,11 +142,13 @@ probe syscall.sys32_sigreturn.return =
 #
 # long sys32_adjtimex(struct timex32 __user *utp)
 #
-probe syscall.sys32_adjtimex = kernel.function("sys32_adjtimex") ? {
+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)
 }
@@ -142,15 +159,16 @@ probe syscall.sys32_adjtimex.return = kernel.function("sys32_adjtimex").return ?
 #			struct linux_dirent32 __user *dirent,
 #			unsigned int count)
 #
-probe syscall.sys32_getdents = kernel.function("sys32_getdents") ? {
+probe syscall.sys32_getdents = kernel.function("sys32_getdents") ?
+{
 	name = "sys32_getdents"
 	fd = $fd
 	dirp_uaddr = $dirent
 	count = $count
 	argstr = sprintf("%d, %p, %d", fd, dirp_uaddr, count)
 }
-probe syscall.sys32_getdents.return =
-	kernel.function("sys32_getdents").return ? {
+probe syscall.sys32_getdents.return = kernel.function("sys32_getdents").return ?
+{
 	name = "sys32_getdents"
 	retstr = returnstr(1)
 }
@@ -159,11 +177,13 @@ probe syscall.sys32_getdents.return =
 #
 # long compat_sys_sysctl(struct __sysctl_args32 __user *args)
 #
-probe syscall.compat_sysctl = kernel.function("compat_sys_sysctl") ? {
+probe syscall.compat_sysctl = kernel.function("compat_sys_sysctl") ?
+{
 	name = "sysctl"
 	argstr = sprintf("%p", $args)
 }
-probe syscall.compat_sysctl.return = kernel.function("compat_sys_sysctl").return ? {
+probe syscall.compat_sysctl.return = kernel.function("compat_sys_sysctl").return ?
+{
 	name = "sysctl"
 	retstr = returnstr(1)
 }
@@ -173,14 +193,15 @@ probe syscall.compat_sysctl.return = kernel.function("compat_sys_sysctl").return
 # asmlinkage long sys32_sched_setparam(u32 pid,
 #		struct sched_param __user *param)
 #
-probe syscall.sys32_sched_setparam = kernel.function("sys32_sched_setparam") ? {
+probe syscall.sys32_sched_setparam = kernel.function("sys32_sched_setparam") ?
+{
 	name = "sys32_sched_setparam"
 	pid = $pid
 	param_uaddr = $param
 	argstr = sprintf("%d, %p", pid, param_uaddr)
 }
-probe syscall.sys32_sched_setparam.return =
-	kernel.function("sys32_sched_setparam").return ? {
+probe syscall.sys32_sched_setparam.return = kernel.function("sys32_sched_setparam").return ?
+{
 	name = "sys32_sched_setparam"
 	retstr = returnstr(1)
 }
@@ -190,15 +211,15 @@ probe syscall.sys32_sched_setparam.return =
 # asmlinkage long sys32_sched_rr_get_interval(u32 pid,
 #		struct compat_timespec __user *interval)
 #
-probe syscall.sys32_sched_rr_get_interval =
-		kernel.function("sys32_sched_rr_get_interval") ? {
+probe syscall.sys32_sched_rr_get_interval = kernel.function("sys32_sched_rr_get_interval") ?
+{
 	name = "sys32_sched_rr_get_interval"
 	pid = $pid
 	interval_uaddr = $interval
-	argstr = sprintf("%d, %p", pid, interval_uaddr)  
+	argstr = sprintf("%d, %p", pid, interval_uaddr)
 }
-probe syscall.sys32_sched_rr_get_interval.return =
-	kernel.function("sys32_sched_rr_get_interval").return ? {
+probe syscall.sys32_sched_rr_get_interval.return = kernel.function("sys32_sched_rr_get_interval").return ?
+{
 	name = "sys32_sched_rr_get_interval"
 	retstr = returnstr(1)
 }
@@ -208,14 +229,15 @@ probe syscall.sys32_sched_rr_get_interval.return =
 # long sys32_rt_sigpending(compat_sigset_t __user *set,
 #			compat_size_t sigsetsize)
 #
-probe syscall.sys32_rt_sigpending = kernel.function("sys32_rt_sigpending") ? {
+probe syscall.sys32_rt_sigpending = kernel.function("sys32_rt_sigpending") ?
+{
 	name = "sys32_rt_sigpending"
 	set_uaddr = $set
 	sigsetsize = $sigsetsize
 	argstr = sprintf("%p, %d", set_uaddr, $sigsetsize)
 }
-probe syscall.sys32_rt_sigpending.return =
-	kernel.function("sys32_rt_sigpending").return ? {
+probe syscall.sys32_rt_sigpending.return = kernel.function("sys32_rt_sigpending").return ?
+{
 	name = "sys32_rt_sigpending"
 	retstr = returnstr(1)
 }
@@ -226,8 +248,8 @@ probe syscall.sys32_rt_sigpending.return =
 #			struct compat_timespec __user *uts,
 #			compat_size_t sigsetsize)
 #
-probe syscall.sys32_rt_sigtimedwait =
-		kernel.function("sys32_rt_sigtimedwait") ? {
+probe syscall.sys32_rt_sigtimedwait = kernel.function("sys32_rt_sigtimedwait") ?
+{
 	name = "sys32_rt_sigtimedwait"
 	uthese_uaddr = $uthese
 	uinfo_uaddr = $uinfo
@@ -236,8 +258,8 @@ probe syscall.sys32_rt_sigtimedwait =
 	argstr = sprintf("%p, %p, %p, %p", uthese_uaddr,
 			uinfo_uaddr, uts_uaddr, sigsetsize)
 }
-probe syscall.sys32_rt_sigtimedwait.return =
-	kernel.function("sys32_rt_sigtimedwait").return ? {
+probe syscall.sys32_rt_sigtimedwait.return = kernel.function("sys32_rt_sigtimedwait").return ?
+{
 	name = "sys32_rt_sigtimedwait"
 	retstr = returnstr(1)
 }
@@ -245,8 +267,8 @@ probe syscall.sys32_rt_sigtimedwait.return =
 #
 # long sys32_rt_sigqueueinfo(u32 pid, u32 sig, compat_siginfo_t __user *uinfo)
 #
-probe syscall.sys32_rt_sigqueueinfo =
-		kernel.function("sys32_rt_sigqueueinfo") ? {
+probe syscall.sys32_rt_sigqueueinfo = kernel.function("sys32_rt_sigqueueinfo") ?
+{
 	name = "sys32_rt_sigqueueinfo"
 	pid = $pid
 	sig = $sig
@@ -254,8 +276,8 @@ probe syscall.sys32_rt_sigqueueinfo =
 	argstr = sprintf("%p, %s, %p", pid, _signal_name($sig),
 				uinfo_uaddr)
 }
-probe syscall.sys32_rt_sigqueueinfo.return =
-	kernel.function("sys32_rt_sigqueueinfo").return ? {
+probe syscall.sys32_rt_sigqueueinfo.return = kernel.function("sys32_rt_sigqueueinfo").return ?
+{
 	name = "sys32_rt_sigqueueinfo"
 	retstr = returnstr(1)
 }
@@ -264,12 +286,13 @@ probe syscall.sys32_rt_sigqueueinfo.return =
 # int sys32_sigaltstack(u32 __new, u32 __old, int r5,
 #			int r6, int r7, int r8, struct pt_regs *regs)
 #
-probe syscall.sys32_sigaltstack = kernel.function("sys32_sigaltstack") ? {
+probe syscall.sys32_sigaltstack = kernel.function("sys32_sigaltstack") ?
+{
 	name = "sys32_sigaltstack"
 	argstr = "FIXME"
 }
-probe syscall.sys32_sigaltstack.return =
-	kernel.function("sys32_sigaltstack").return ? {
+probe syscall.sys32_sigaltstack.return = kernel.function("sys32_sigaltstack").return ?
+{
 	name = "sys32_sigaltstack"
 	retstr = returnstr(1)
 }
@@ -278,7 +301,8 @@ probe syscall.sys32_sigaltstack.return =
 # asmlinkage int sys32_sendfile64(int out_fd, int in_fd,
 #		compat_loff_t __user *offset, s32 count)
 #
-probe syscall.sys32_sendfile64 = kernel.function("sys32_sendfile64") ? {
+probe syscall.sys32_sendfile64 = kernel.function("sys32_sendfile64") ?
+{
 	name = "sys32_sendfile64"
 	out_fd = $out_fd
 	in_fd = $in_fd
@@ -287,8 +311,8 @@ probe syscall.sys32_sendfile64 = kernel.function("sys32_sendfile64") ? {
 	argstr = sprintf("%d, %d, %p, %d", $out_fd, $in_fd, offset_uaddr,
 				$count)
 }
-probe syscall.sys32_sendfile64.return =
-	kernel.function("sys32_sendfile64").return ? {
+probe syscall.sys32_sendfile64.return = kernel.function("sys32_sendfile64").return ?
+{
 	name = "sys32_sendfile64"
 	retstr = returnstr(1)
 }
@@ -298,7 +322,8 @@ probe syscall.sys32_sendfile64.return =
 #			struct compat_sigevent __user *ev32,
 #			timer_t __user *timer_id)
 #
-probe syscall.ppc32_timer_create = kernel.function("ppc32_timer_create") ? {
+probe syscall.ppc32_timer_create = kernel.function("ppc32_timer_create") ?
+{
 	name = "ppc32_timer_create"
 	which_clock = $clock
 	timer_event_spec = $ev32
@@ -306,8 +331,8 @@ probe syscall.ppc32_timer_create = kernel.function("ppc32_timer_create") ? {
 	argstr = sprintf("%d, %p, %p", which_clock, timer_event_spec,
 				created_timer_id)
 }
-probe syscall.ppc32_timer_create.return =
-	kernel.function("ppc32_timer_create").return ? {
+probe syscall.ppc32_timer_create.return = kernel.function("ppc32_timer_create").return ?
+{
 	name = "ppc32_timer_create"
 	retstr = returnstr(1)
 }
@@ -317,7 +342,8 @@ probe syscall.ppc32_timer_create.return =
 #			struct compat_itimerspec __user *new,
 #			struct compat_itimerspec __user *old)
 #
-probe syscall.compat_timer_settime = kernel.function("compat_timer_settime") ? {
+probe syscall.compat_timer_settime = kernel.function("compat_timer_settime") ?
+{
 	name = "compat_timer_settime"
 	timer_id = $timer_id
 	flags = $flags
@@ -326,8 +352,8 @@ probe syscall.compat_timer_settime = kernel.function("compat_timer_settime") ? {
 	argstr = sprintf("%d, %d, %p, %p", timer_id, flags,
 				new_setting_uaddr, old_setting_uaddr)
 }
-probe syscall.compat_timer_settime.return =
-	kernel.function("compat_timer_settime").return ? {
+probe syscall.compat_timer_settime.return = kernel.function("compat_timer_settime").return ?
+{
 	name = "compat_timer_settime"
 	retstr = returnstr(1)
 }
@@ -336,14 +362,15 @@ probe syscall.compat_timer_settime.return =
 # long compat_timer_gettime(timer_t timer_id,
 #		struct compat_itimerspec __user *setting)
 #
-probe syscall.compat_timer_gettime = kernel.function("compat_timer_gettime") ? {
+probe syscall.compat_timer_gettime = kernel.function("compat_timer_gettime") ?
+{
 	name = "compat_timer_gettime"
 	timer_id = $timer_id
 	setting_uaddr = $setting
 	argstr = sprintf("%d, %p", timer_id, setting_uaddr)
 }
-probe syscall.compat_timer_gettime.return =
-	kernel.function("compat_timer_gettime").return ? {
+probe syscall.compat_timer_gettime.return = kernel.function("compat_timer_gettime").return ?
+{
 	name = "compat_timer_gettime"
 	retstr = returnstr(1)
 }
@@ -352,14 +379,15 @@ probe syscall.compat_timer_gettime.return =
 # long compat_clock_settime(clockid_t which_clock,
 #			struct compat_timespec __user *tp)
 #
-probe syscall.compat_clock_settime = kernel.function("compat_clock_settime") ? {
+probe syscall.compat_clock_settime = kernel.function("compat_clock_settime") ?
+{
 	name = "compat_clock_settime"
 	which_clock = $which_clock
 	tp_uaddr = $tp
 	argstr = sprintf("%d, %p", which_clock, tp_uaddr)
 }
-probe syscall.compat_clock_settime.return =
-	kernel.function("compat_clock_settime").return ? {
+probe syscall.compat_clock_settime.return = kernel.function("compat_clock_settime").return ?
+{
 	name = "compat_clock_settime"
 	retstr = returnstr(1)
 }
@@ -370,7 +398,8 @@ probe syscall.compat_clock_settime.return =
 #			int ctx_size, int r6, int r7, int r8,
 #			struct pt_regs *regs)
 #
-probe syscall.sys32_swapcontext = kernel.function("sys32_swapcontext") ? {
+probe syscall.sys32_swapcontext = kernel.function("sys32_swapcontext") ?
+{
 	name = "sys32_swapcontext"
 	old_ctx_uaddr = $old_ctx
 	new_ctx_uaddr = $new_ctx
@@ -382,8 +411,8 @@ probe syscall.sys32_swapcontext = kernel.function("sys32_swapcontext") ? {
 	argstr = sprintf("%p, %p, %d, %d, %d, %d, %p",
 			old_ctx_uaddr, new_ctx_uaddr, r5, r6, r7, r8, regs)
 }
-probe syscall.sys32_swapcontext.return =
-	kernel.function("sys32_swapcontext").return ? {
+probe syscall.sys32_swapcontext.return = kernel.function("sys32_swapcontext").return ?
+{
 	name = "sys32_swapcontext"
 	retstr = returnstr(1)
 }
@@ -392,14 +421,16 @@ probe syscall.sys32_swapcontext.return =
 # asmlinkage long sys32_utimes(char __user *filename,
 #			struct compat_timeval __user *tvs)
 #
-probe syscall.sys32_utimes = kernel.function("sys32_utimes") ? {
+probe syscall.sys32_utimes = kernel.function("sys32_utimes") ?
+{
 	name = "sys32_utimes"
 	filename_uaddr = $filename
 	path = user_string($filename)
 	tvp_uaddr = $tvs
 	argstr = sprintf("%s, %p", user_string_quoted($filename), tvp_uaddr)
 }
-probe syscall.sys32_utimes.return = kernel.function("sys32_utimes").return ? {
+probe syscall.sys32_utimes.return = kernel.function("sys32_utimes").return ?
+{
 	name = "sys32_utimes"
 	retstr = returnstr(1)
 }
@@ -409,7 +440,8 @@ probe syscall.sys32_utimes.return = kernel.function("sys32_utimes").return ? {
 #			compat_ulong_t mode, compat_ulong_t __user *nmask,
 #			compat_ulong_t maxnode, compat_ulong_t flags)
 #
-probe syscall.compat_mbind = kernel.function("compat_mbind") ? {
+probe syscall.compat_mbind = kernel.function("compat_mbind") ?
+{
 	name = "compat_mbind"
 	start_uaddr = $start
 	len = $len
@@ -420,7 +452,8 @@ probe syscall.compat_mbind = kernel.function("compat_mbind") ? {
 	argstr = sprintf("%p, %d, %d, %p, %d, %d", start_uaddr, len,
 			policy, nodemask_uaddr, maxnode, flags)
 }
-probe syscall.compat_mbind.return = kernel.function("compat_mbind").return ? {
+probe syscall.compat_mbind.return = kernel.function("compat_mbind").return ?
+{
 	name = "compat_mbind"
 	retstr = returnstr(1)
 }
@@ -431,7 +464,8 @@ probe syscall.compat_mbind.return = kernel.function("compat_mbind").return ? {
 #				compat_ulong_t maxnode,
 #				compat_ulong_t addr, compat_ulong_t flags)
 #
-probe syscall.compat_get_mempolicy = kernel.function("compat_get_mempolicy") ? {
+probe syscall.compat_get_mempolicy = kernel.function("compat_get_mempolicy") ?
+{
 	name = "compat_get_mempolicy"
 	policy_uaddr = $policy
 	nmask_uaddr = $nmask
@@ -441,8 +475,8 @@ probe syscall.compat_get_mempolicy = kernel.function("compat_get_mempolicy") ? {
 	argstr = sprintf("%p, %p, %d, %d", policy_uaddr, nmask_uaddr,
 				maxnode, addr)
 }
-probe syscall.compat_get_mempolicy.return =
-	kernel.function("compat_get_mempolicy").return ? {
+probe syscall.compat_get_mempolicy.return = kernel.function("compat_get_mempolicy").return ?
+{
 	name = "compat_get_mempolicy"
 	retstr = returnstr(1)
 }
@@ -451,15 +485,16 @@ probe syscall.compat_get_mempolicy.return =
 # asmlinkage long compat_set_mempolicy(int mode, compat_ulong_t __user *nmask,
 #				compat_ulong_t maxnode)
 #
-probe syscall.compat_set_mempolicy = kernel.function("compat_set_mempolicy") ? {
+probe syscall.compat_set_mempolicy = kernel.function("compat_set_mempolicy") ?
+{
 	name = "compat_set_mempolicy"
 	policy = $mode
 	nodemask_uaddr = $nmask
 	maxnode = $maxnode
 	argstr = sprintf("%d, %p, %d", policy, nodemask_uaddr, maxnode)
 }
-probe syscall.compat_set_mempolicy.return =
-	kernel.function("compat_set_mempolicy").return ? {
+probe syscall.compat_set_mempolicy.return = kernel.function("compat_set_mempolicy").return ?
+{
 	name = "compat_set_mempolicy"
 	retstr = returnstr(1)
 }
@@ -469,7 +504,8 @@ probe syscall.compat_set_mempolicy.return =
 #		       unsigned long prot, unsigned long flags,
 #		       unsigned long fd, off_t offset)
 #
-probe syscall.mmap = kernel.function("sys_mmap") ? {
+probe syscall.mmap = kernel.function("sys_mmap") ?
+{
         name = "mmap"
         start = $addr
         len = $len
@@ -481,7 +517,8 @@ probe syscall.mmap = kernel.function("sys_mmap") ? {
                 _mprotect_prot_str($prot), _mmap_flags($flags), $fd, $offset)
 }
 
-probe syscall.mmap.return = kernel.function("sys_mmap").return ? {
+probe syscall.mmap.return = kernel.function("sys_mmap").return ?
+{
         name = "mmap"
         retstr = returnstr(2)
 }
@@ -494,9 +531,8 @@ probe syscall.mmap.return = kernel.function("sys_mmap").return ? {
 #			  unsigned long prot, unsigned long flags,
 #			  unsigned long fd, unsigned long pgoff)
 #
-probe syscall.mmap2 = 
-		kernel.function("sys_mmap2") ?,
-		kernel.function("compat_sys_mmap2") ?
+probe syscall.mmap2 = kernel.function("sys_mmap2") ?,
+                      kernel.function("compat_sys_mmap2") ?
 {
 	name = "mmap2"
 	start = $addr
@@ -505,13 +541,12 @@ probe syscall.mmap2 =
 	flags = $flags
 	fd = $fd
 	pgoffset = $pgoff
-	argstr = sprintf("%p, %d, %s, %s, %d, %d", $addr, 
+	argstr = sprintf("%p, %d, %s, %s, %d, %d", $addr,
 		$len, _mprotect_prot_str($prot), _mmap_flags($flags),
 		$fd, $pgoff)
 }
-probe syscall.mmap2.return = 
-		kernel.function("sys_mmap2").return ?,
-		kernel.function("compat_sys_mmap2").return ?
+probe syscall.mmap2.return = kernel.function("sys_mmap2").return ?,
+                             kernel.function("compat_sys_mmap2").return ?
 {
 	name = "mmap2"
 	retstr = returnstr(2)
@@ -521,14 +556,15 @@ probe syscall.mmap2.return =
 #
 # long ppc64_sys_stime(long __user * tptr)
 #
-probe syscall.ppc64_sys_stime = kernel.function("ppc64_sys_stime") ? {
+probe syscall.ppc64_sys_stime = kernel.function("ppc64_sys_stime") ?
+{
 	name = "ppc64_sys_stime"
 	/* FIXME */
 	t_uaddr = $tptr
 	argstr = sprintf("%p", t_uaddr)
 }
-probe syscall.ppc64_sys_stime.return =
-	kernel.function("ppc64_sys_stime").return ? {
+probe syscall.ppc64_sys_stime.return = kernel.function("ppc64_sys_stime").return ?
+{
 	name = "ppc64_sys_stime"
 	retstr = returnstr(1)
 }
@@ -536,16 +572,18 @@ probe syscall.ppc64_sys_stime.return =
 #
 # asmlinkage int ppc64_newuname(struct new_utsname __user * name)
 #
-probe syscall.ppc64_newuname = kernel.function("ppc64_newuname") ? {
+probe syscall.ppc64_newuname = kernel.function("ppc64_newuname") ?
+{
 	name = "ppc64_newuname"
 	name_uaddr = $name
 	argstr = sprintf("%p", name_uaddr)
 }
-probe syscall.ppc64_newuname.return = kernel.function("ppc64_newuname").return ? {
+probe syscall.ppc64_newuname.return = kernel.function("ppc64_newuname").return ?
+{
 	name = "ppc64_newuname"
 	retstr = returnstr(1)
 }
 
 #
-#  
+#
 
diff --git a/tapset/s390x/syscalls.stp b/tapset/s390x/syscalls.stp
index 17988acee..94e07adf2 100644
--- a/tapset/s390x/syscalls.stp
+++ b/tapset/s390x/syscalls.stp
@@ -32,11 +32,13 @@ probe syscall.getresuid16.return = kernel.function("sys32_getresuid16").return ?
 # ipc _________________________________________________
 # long sys32_ipc(u32 call, int first, int second, int third, u32 ptr)
 #
-probe syscall.ipc = kernel.function("sys32_ipc") ? {
+probe syscall.ipc = kernel.function("sys32_ipc") ?
+{
 	name = "ipc"
 	argstr = sprintf("%d, %d, %d, %d, %p", $call, $first, $second, $third, $ptr)
 }
-probe syscall.ipc.return = kernel.function("sys_ipc").return ? {
+probe syscall.ipc.return = kernel.function("sys_ipc").return ?
+{
 	name = "ipc"
 	retstr = returnstr(1)
 }
@@ -46,8 +48,8 @@ probe syscall.ipc.return = kernel.function("sys_ipc").return ? {
 # long old32_mmap(struct mmap_arg_struct_emu31 __user *arg)
 #
 probe syscall.mmap = kernel.function("old_mmap") ?,
-		     kernel.function("old32_mmap") ?,
-		     kernel.function("SyS_s390_old_mmap") ?
+                     kernel.function("old32_mmap") ?,
+                     kernel.function("SyS_s390_old_mmap") ?
 {
 	name = "mmap"
 
@@ -58,8 +60,8 @@ probe syscall.mmap = kernel.function("old_mmap") ?,
 }
 
 probe syscall.mmap.return = kernel.function("old_mmap").return ?,
-			    kernel.function("old32_mmap").return ?,
-			    kernel.function("SyS_s390_old_mmap").return ?
+                            kernel.function("old32_mmap").return ?,
+                            kernel.function("SyS_s390_old_mmap").return ?
 {
         name = "mmap"
         retstr = returnstr(2)
@@ -72,8 +74,8 @@ probe syscall.mmap.return = kernel.function("old_mmap").return ?,
 # long sys32_mmap2(struct mmap_arg_struct_emu31 __user *arg)
 #
 probe syscall.mmap2 = kernel.function("sys_mmap2") ?,
-		      kernel.function("sys32_mmap2") ?,
-		      kernel.function("SyS_mmap2") ?
+                      kernel.function("sys32_mmap2") ?,
+                      kernel.function("SyS_mmap2") ?
 {
         name = "mmap2"
 
@@ -84,8 +86,8 @@ probe syscall.mmap2 = kernel.function("sys_mmap2") ?,
 }
 
 probe syscall.mmap2.return = kernel.function("sys_mmap2").return ?,
-			     kernel.function("sys32_mmap2").return ?,
-		             kernel.function("SyS_mmap2").return ?
+                             kernel.function("sys32_mmap2").return ?,
+                             kernel.function("SyS_mmap2").return ?
 {
         name = "mmap2"
         retstr = returnstr(2)
@@ -95,11 +97,13 @@ probe syscall.mmap2.return = kernel.function("sys_mmap2").return ?,
 #
 # long sys32_sysctl(struct __sysctl_args32 __user *args)
 #
-probe syscall.sysctl32 = kernel.function("sys32_sysctl") ? {
+probe syscall.sysctl32 = kernel.function("sys32_sysctl") ?
+{
 	name = "sysctl"
 	argstr = sprintf("%p", $args)
 }
-probe syscall.sysctl32.return = kernel.function("sys32_sysctl").return ? {
+probe syscall.sysctl32.return = kernel.function("sys32_sysctl").return ?
+{
 	name = "sysctl"
 	retstr = returnstr(1)
 }
diff --git a/tapset/x86_64/syscalls.stp b/tapset/x86_64/syscalls.stp
index ad16878f6..c0cb81390 100644
--- a/tapset/x86_64/syscalls.stp
+++ b/tapset/x86_64/syscalls.stp
@@ -5,13 +5,15 @@
 #
 # NOTE: x86_64 only.
 #
-probe syscall.arch_prctl = kernel.function("sys_arch_prctl") {
+probe syscall.arch_prctl = kernel.function("sys_arch_prctl")
+{
 	name = "arch_prctl"
 	code = $code
 	addr = $addr
 	argstr = sprintf("%d, %p", $code, $addr)
 }
-probe syscall.arch_prctl.return = kernel.function("sys_arch_prctl").return {
+probe syscall.arch_prctl.return = kernel.function("sys_arch_prctl").return
+{
 	name = "arch_prctl"
 	retstr = returnstr(1)
 }
@@ -21,7 +23,8 @@ probe syscall.arch_prctl.return = kernel.function("sys_arch_prctl").return {
 # NOTE. This function is only in i386 and x86_64 and its args vary
 # between those two archs.
 #
-probe syscall.iopl = kernel.function("sys_iopl") {
+probe syscall.iopl = kernel.function("sys_iopl")
+{
 	name = "iopl"
 %( kernel_vr == "*xen" %?
 	level = $new_iopl
@@ -30,7 +33,8 @@ probe syscall.iopl = kernel.function("sys_iopl") {
 %)
 	argstr = sprint(level)
 }
-probe syscall.iopl.return = kernel.function("sys_iopl").return {
+probe syscall.iopl.return = kernel.function("sys_iopl").return
+{
 	name = "iopl"
 	retstr = returnstr(1)
 }
@@ -41,14 +45,16 @@ probe syscall.iopl.return = kernel.function("sys_iopl").return {
 #
 # NOTE: args vary between archs.
 #
-probe syscall.sigaltstack = kernel.function("sys_sigaltstack") {
+probe syscall.sigaltstack = kernel.function("sys_sigaltstack")
+{
 	name = "sigaltstack"
 	uss_uaddr = $uss
 	uoss_uaddr = $uoss
 	regs_uaddr = $regs
 	argstr = sprintf("%p, %p", $uss, $uoss)
 }
-probe syscall.sigaltstack.return = kernel.function("sys_sigaltstack").return {
+probe syscall.sigaltstack.return = kernel.function("sys_sigaltstack").return
+{
 	name = "sigaltstack"
 	retstr = returnstr(1)
 }
@@ -57,11 +63,13 @@ probe syscall.sigaltstack.return = kernel.function("sys_sigaltstack").return {
 #
 # long sys32_sysctl(struct sysctl_ia32 __user *args32)
 #
-probe syscall.sysctl32 = kernel.function("sys32_sysctl") ? {
+probe syscall.sysctl32 = kernel.function("sys32_sysctl") ?
+{
 	name = "sysctl"
 	argstr = sprintf("%p", $args32)
 }
-probe syscall.sysctl32.return = kernel.function("sys32_sysctl").return ? {
+probe syscall.sysctl32.return = kernel.function("sys32_sysctl").return ?
+{
 	name = "sysctl"
 	retstr = returnstr(1)
 }
@@ -70,7 +78,8 @@ probe syscall.sysctl32.return = kernel.function("sys32_sysctl").return ? {
 # long sys_mmap(unsigned long addr, unsigned long len,
 #          unsigned long prot, unsigned long flags,
 #          unsigned long fd, unsigned long off)
-probe syscall.mmap = kernel.function("sys_mmap") ? {
+probe syscall.mmap = kernel.function("sys_mmap") ?
+{
 	name = "mmap"
 	start = $addr
 	len = $len
@@ -82,19 +91,22 @@ probe syscall.mmap = kernel.function("sys_mmap") ? {
 		_mprotect_prot_str($prot), _mmap_flags($flags), $fd, $off)
 }
 
-probe syscall.mmap.return = kernel.function("sys_mmap").return ? {
+probe syscall.mmap.return = kernel.function("sys_mmap").return ?
+{
 	name = "mmap"
 	retstr = returnstr(2)
 }
 #
 # sys32_mmap(struct mmap_arg_struct __user *arg)
 #
-probe syscall.mmap32 = kernel.function("sys32_mmap") {
+probe syscall.mmap32 = kernel.function("sys32_mmap")
+{
 	name = "mmap"
 	argstr = get_mmap_args($arg)
 }
 
-probe syscall.mmap32.return = kernel.function("sys32_mmap").return {
+probe syscall.mmap32.return = kernel.function("sys32_mmap").return
+{
         name = "mmap"
         retstr = returnstr(2)
 }
@@ -103,13 +115,15 @@ probe syscall.mmap32.return = kernel.function("sys32_mmap").return {
 #	unsigned long prot, unsigned long flags,
 #	unsigned long fd, unsigned long pgoff)
 #
-probe syscall.mmap2 = kernel.function("sys32_mmap2") {
+probe syscall.mmap2 = kernel.function("sys32_mmap2")
+{
 	name = "mmap2"
 	argstr = sprintf("%p, %d, %s, %s, %d, %d", $addr, $len,
 		_mprotect_prot_str($prot), _mmap_flags($flags), $fd, $pgoff)
 }
 
-probe syscall.mmap2.return = kernel.function("sys32_mmap2").return {
+probe syscall.mmap2.return = kernel.function("sys32_mmap2").return
+{
 	name = "mmap2"
 	retstr = returnstr(2)
 }
@@ -118,11 +132,13 @@ probe syscall.mmap2.return = kernel.function("sys32_mmap2").return {
 #
 # long sys32_vm86_warning(void)
 #
-probe syscall.vm86_warning = kernel.function("sys32_vm86_warning") {
+probe syscall.vm86_warning = kernel.function("sys32_vm86_warning")
+{
 	name = "vm86_warning"
 	argstr = ""
 }
-probe syscall.vm86_warning.return = kernel.function("sys32_vm86_warning").return {
+probe syscall.vm86_warning.return = kernel.function("sys32_vm86_warning").return
+{
 	name = "wm86_warning"
 	retstr = returnstr(1)
 }
@@ -130,11 +146,13 @@ probe syscall.vm86_warning.return = kernel.function("sys32_vm86_warning").return
 #
 # long sys32_pipe(int __user *fd)
 #
-probe syscall.pipe32 = kernel.function("sys32_pipe") {
+probe syscall.pipe32 = kernel.function("sys32_pipe")
+{
 	name = "pipe"
 	argstr = sprintf("%p", $fd)
 }
-probe syscall.pipe32.return = kernel.function("sys32_pipe").return {
+probe syscall.pipe32.return = kernel.function("sys32_pipe").return
+{
 	name = "pipe"
 	retstr = returnstr(1)
 }
-- 
2.43.5