PR 11338 (partial): Used '@defined()' in syscall tapsets.

* tapset/syscalls.stp: Used '@defined()' to remove kernel version checks.
* tapset/syscalls2.stp: Ditto.
* tapset/x86_64/syscalls.stp: Ditto.
* tapset/nd_syscalls.stp: Updated to match tapset/syscalls.stp.
* tapset/nd_syscalls2.stp: Updated to match tapset/syscalls2.stp.
* tapset/x86_64/nd_syscalls.stp: Updated to match
  tapset/x86_64/syscalls.stp.

6 files changed, 100 insertions, 225 deletions

diff --git a/tapset/nd_syscalls.stp b/tapset/nd_syscalls.stp
index e7492a11..a053f8f1 100644
--- a/tapset/nd_syscalls.stp
+++ b/tapset/nd_syscalls.stp
@@ -1,6 +1,6 @@
 // syscalls tapset part 1 [A-M]
 // Copyright (C) 2005 IBM Corp.
-// Copyright (C) 2005-2007 Red Hat Inc.
+// Copyright (C) 2005, 2006, 2007, 2010 Red Hat Inc.
 // Copyright (C) 2007 Quentin Barnes.
 //
 // This file is part of systemtap, and is free software.  You can
@@ -2362,20 +2362,12 @@ probe nd_syscall.getxattr = kprobe.function("SyS_getxattr") ?,
                             kprobe.function("sys_getxattr") ?
 {
 	name = "getxattr"
-	// %( kernel_v >= "2.6.27" %?
-	// 	path = user_string($pathname)
-	// %:
-	// 	path = user_string($path)
-	// %)
+	//	path = user_string(@defined($pathname) ? $pathname : $path)
 	// 	name2 = user_string($name)
 	// 	value_uaddr = $value
 	// 	size = $size
 	// 	argstr = sprintf("%s, %s, %p, %d",
-	// %( kernel_v >= "2.6.27" %?
-	// 		user_string_quoted($pathname),
-	// %:
-	// 		user_string_quoted($path),
-	// %)
+	//		user_string_quoted(@defined($pathname) ? $pathname : $path),
 	// 		user_string_quoted($name),
 	// 		value_uaddr, size)
 	asmlinkage()
@@ -2432,15 +2424,11 @@ probe nd_syscall.inotify_add_watch = kprobe.function("SyS_inotify_add_watch") ?,
 	name = "inotify_add_watch"
 	// 	fd = $fd
 	// 	mask = $mask
-	// %( kernel_v >= "2.6.27" %?
-	// 	path_uaddr = $pathname
-	// 	path = user_string($pathname)
-	// 	argstr = sprintf("%d, %s, %d", $fd, user_string_quoted($pathname), $mask)
-	// %:
-	// 	path_uaddr = $path
-	// 	path = user_string($path)
-	// 	argstr = sprintf("%d, %s, %d", $fd, user_string_quoted($path), $mask)
-	// %)
+	//	path_uaddr = (@defined($pathname) ? $pathname : $path)
+	//	path = user_string(@defined($pathname) ? $pathname : $path)
+	//	argstr = sprintf("%d, %s, %d", $fd,
+	//		user_string_quoted(@defined($pathname) ? $pathname : $path),
+	//		$mask)
 	asmlinkage()
 	fd = int_arg(1)
 	path_uaddr = pointer_arg(2)
@@ -2897,21 +2885,13 @@ probe nd_syscall.lgetxattr = kprobe.function("SyS_lgetxattr") ?,
                              kprobe.function("sys_lgetxattr") ?
 {
 	name = "lgetxattr"
-	// %( kernel_v >= "2.6.27" %?
-	// 	path = user_string($pathname)
-	// %:
-	// 	path = user_string($path)
-	// %)
+	//	path = user_string(@defined($pathname) ? $pathname : $path)
 	// 	# FIXME
 	// 	name2 = user_string($name)
 	// 	value_uaddr = $value
 	// 	size = $size
 	// 	argstr = sprintf("%s, %s, %p, %d",
-	// %( kernel_v >= "2.6.27" %?
-	// 		user_string_quoted($pathname),
-	// %:
-	// 		user_string_quoted($path),
-	// %)
+	//		user_string_quoted(@defined($pathname) ? $pathname : $path),
 	// 		user_string_quoted($name),
 	// 		value_uaddr, size)
 	asmlinkage()
@@ -3028,15 +3008,11 @@ probe nd_syscall.listxattr = kprobe.function("SyS_listxattr") ?,
 	name = "listxattr"
 	// 	list_uaddr = $list
 	// 	size = $size
-	// %( kernel_v >= "2.6.27" %?
-	// 	path_uaddr = $pathname
-	// 	path = user_string($pathname)
-	// 	argstr = sprintf("%s, %p, %d", user_string_quoted($pathname), $list, $size)
-	// %:
-	// 	path_uaddr = $path
-	// 	path = user_string($path)
-	// 	argstr = sprintf("%s, %p, %d", user_string_quoted($path), $list, $size)
-	// %)
+	//	path_uaddr = (@defined($pathname) ? $pathname : $path)
+	//	path = user_string(@defined($pathname) ? $pathname : $path)
+	//	argstr = sprintf("%s, %p, %d",
+	//		user_string_quoted(@defined($pathname) ? $pathname : $path),
+	//		$list, $size)
 	asmlinkage()
 	path_uaddr = pointer_arg(1)
 	path = user_string(path_uaddr)
@@ -3060,15 +3036,11 @@ probe nd_syscall.llistxattr = kprobe.function("SyS_llistxattr") ?,
 	name = "llistxattr"
 	// 	list_uaddr = $list
 	// 	size = $size
-	// %( kernel_v >= "2.6.27" %?
-	// 	path_uaddr = $pathname
-	// 	path = user_string($pathname)
-	// 	argstr = sprintf("%s, %p, %d", user_string_quoted($pathname), $list, $size)
-	// %:
-	// 	path_uaddr = $path
-	// 	path = user_string($path)
-	// 	argstr = sprintf("%s, %p, %d", user_string_quoted($path), $list, $size)
-	// %)
+	//	path_uaddr = (@defined($pathname) ? $pathname : $path)
+	//	path = user_string(@defined($pathname) ? $pathname : $path)
+	//	argstr = sprintf("%s, %p, %d",
+	//		user_string_quoted(@defined($pathname) ? $pathname : $path),
+	//		$list, $size)
 	asmlinkage()
 	path_uaddr = pointer_arg(1)
 	path = user_string(path_uaddr)
@@ -3151,15 +3123,11 @@ probe nd_syscall.lremovexattr = kprobe.function("SyS_lremovexattr") ?,
 	name = "lremovexattr"
 	// 	name_uaddr = $name
 	// 	name2 = user_string($name)
-	// %( kernel_v >= "2.6.27" %?
-	// 	path_uaddr = $pathname
-	// 	path = user_string($pathname)
-	// 	argstr = sprintf("%s, %s", user_string_quoted($pathname), user_string_quoted($name))
-	// %:
-	// 	path_uaddr = $path
-	// 	path = user_string($path)
-	// 	argstr = sprintf("%s, %s", user_string_quoted($path), user_string_quoted($name))
-	// %)
+	//	path_uaddr = (@defined($pathname) ? $pathname : $path)
+	//	path = user_string(@defined($pathname) ? $pathname : $path)
+	//	argstr = sprintf("%s, %s",
+	//		user_string_quoted(@defined($pathname) ? $pathname : $path),
+	//		user_string_quoted($name))
 	asmlinkage()
 	path_uaddr = pointer_arg(1)
 	path = user_string(path_uaddr)
@@ -3211,26 +3179,17 @@ probe nd_syscall.lsetxattr = kprobe.function("SyS_lsetxattr") ?,
                              kprobe.function("sys_lsetxattr") ?
 {
 	name = "lsetxattr"
-	// %( kernel_v >= "2.6.27" %?
-	// 	path_uaddr = $pathname
-	// 	path = user_string($pathname)
-	// %:
-	// 	path_uaddr = $path
-	// 	path = user_string($path)
-	// %)
+	//	path_uaddr = (@defined($pathname) ? $pathname : $path)
+	//	path = user_string(@defined($pathname) ? $pathname : $path)
 	// 	name_uaddr = $name
 	// 	name_str = user_string($name)
 	// 	value_uaddr = $value
 	// 	size = $size
 	// 	flags = $flags
-	// 	argstr = sprintf("%s, %s, %p, %d, %d",
-	// %( kernel_v >= "2.6.27" %?
-	// 			user_string_quoted($pathname),
-	// %:
-	// 			user_string_quoted($path),
-	// %)
-	// 			user_string_quoted($name),
-	// 			value_uaddr, $size, $flags)
+	//	argstr = sprintf("%s, %s, %p, %d, %d",
+	//			user_string_quoted(@defined($pathname) ? $pathname : $path),
+	//			user_string_quoted($name),
+	//			value_uaddr, $size, $flags)
 	asmlinkage()
 	path_uaddr = pointer_arg(1)
 	path = user_string(path_uaddr)
diff --git a/tapset/nd_syscalls2.stp b/tapset/nd_syscalls2.stp
index 2b83e1fc..fb193324 100644
--- a/tapset/nd_syscalls2.stp
+++ b/tapset/nd_syscalls2.stp
@@ -1,6 +1,6 @@
 // syscalls tapset part 2 [N-Z]
 // Copyright (C) 2005 IBM Corp.
-// Copyright (C) 2005, 2006, 2007 Red Hat Inc.
+// Copyright (C) 2005, 2006, 2007, 2010 Red Hat Inc.
 // Copyright (C) 2007 Quentin Barnes.
 //
 // This file is part of systemtap, and is free software.  You can
@@ -1058,11 +1058,7 @@ probe nd_syscall.remap_file_pages = kprobe.function("SyS_remap_file_pages") ?,
 	name = "remap_file_pages"
 	// start = $start
 	// size = $size
-// %( kernel_vr >= "2.6.24" %?
-	// prot = $prot
-// %:
-	// prot = $__prot
-// %)
+	// prot = (@defined($prot) ? $prot : $__prot)
 	// pgoff = $pgoff
 	// flags = $flags
 	asmlinkage()
@@ -4336,14 +4332,14 @@ probe nd_syscall.wait4 = kprobe.function("SyS_wait4") ?,
                          kprobe.function("sys_wait4") ?
 {
 	name = "wait4"
-	// pid = %( kernel_vr >= "2.6.25" %? $upid %: $pid%)
+	// pid = (@defined($upid) ? $upid : $pid)
 	// status_uaddr = $stat_addr
 	// options = $options
 	// options_str = _wait4_opt_str($options)
 	// rusage_uaddr = $ru
 	// argstr = sprintf("%d, %p, %s, %p",
-	// 		 %( kernel_vr >= "2.6.25" %? $upid %: $pid%),
-	// 		 $stat_addr, _wait4_opt_str($options), $ru)
+	// 		(@defined($upid) ? $upid : $pid),
+	// 		$stat_addr, _wait4_opt_str($options), $ru)
 	asmlinkage()
 	pid = int_arg(1)
 	status_uaddr = pointer_arg(2)
@@ -4372,7 +4368,7 @@ probe nd_syscall.waitid = kprobe.function("SyS_waitid") ?,
                           kprobe.function("sys_waitid") ?
 {
 	name = "waitid"
-	// pid = %( kernel_vr >= "2.6.25" %? $upid %: $pid%)
+	// pid = (@defined($upid) ? $upid : $pid)
 	// which = $which
 	// which_str = _waitid_which_str($which)
 	// infop_uaddr = $infop
@@ -4380,7 +4376,7 @@ probe nd_syscall.waitid = kprobe.function("SyS_waitid") ?,
 	// options_str = _waitid_opt_str($options)
 	// rusage_uaddr = $ru
 	// argstr = sprintf("%d, %d, %p, %s, %p", $which,
-	// 	   %( kernel_vr >= "2.6.25" %? $upid %: $pid%), $infop,
+	// 	   (@defined($upid) ? $upid : $pid), $infop,
 	// 	    _waitid_opt_str($options), $ru)
 	asmlinkage()
 	pid =  int_arg(1)
diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp
index 430d37ff..0970df5b 100644
--- a/tapset/syscalls.stp
+++ b/tapset/syscalls.stp
@@ -1,6 +1,6 @@
 // syscalls tapset part 1 [A-M]
 // Copyright (C) 2005 IBM Corp.
-// Copyright (C) 2005-2007 Red Hat Inc.
+// Copyright (C) 2005, 2006, 2007, 2010 Red Hat Inc.
 // Copyright (C) 2007 Quentin Barnes.
 //
 // This file is part of systemtap, and is free software.  You can
@@ -1963,23 +1963,15 @@ probe syscall.getxattr = kernel.function("SyS_getxattr").call !,
                          kernel.function("sys_getxattr").call
 {
 	name = "getxattr"
-%( kernel_v >= "2.6.27" %?
-	path = user_string($pathname)
-%:
-	path = user_string($path)
-%)
+	path = user_string(@defined($pathname) ? $pathname : $path)
 	# FIXME
 	name2 = user_string($name)
 	value_uaddr = $value
 	size = $size
 	argstr = sprintf("%s, %s, %p, %d",
-%( kernel_v >= "2.6.27" %?
-		user_string_quoted($pathname),
-%:
-		user_string_quoted($path),
-%)
+		user_string_quoted(@defined($pathname) ? $pathname : $path),
 		user_string_quoted($name),
-		value_uaddr, size)
+		$value, $size)
 }
 probe syscall.getxattr.return = kernel.function("SyS_getxattr").return !,
                                 kernel.function("sys_getxattr").return
@@ -2019,15 +2011,11 @@ probe syscall.inotify_add_watch = kernel.function("SyS_inotify_add_watch").call
 	name = "inotify_add_watch"
 	fd = $fd
 	mask = $mask
-%( kernel_v >= "2.6.27" %?
-	path_uaddr = $pathname
-	path = user_string($pathname)
-	argstr = sprintf("%d, %s, %d", $fd, user_string_quoted($pathname), $mask)
-%:
-	path_uaddr = $path
-	path = user_string($path)
-	argstr = sprintf("%d, %s, %d", $fd, user_string_quoted($path), $mask)
-%)
+	path_uaddr = (@defined($pathname) ? $pathname : $path)
+	path = user_string(@defined($pathname) ? $pathname : $path)
+	argstr = sprintf("%d, %s, %d", $fd,
+		user_string_quoted(@defined($pathname) ? $pathname : $path),
+		$mask)
 }
 
 probe syscall.inotify_add_watch.return = kernel.function("SyS_inotify_add_watch").return !,
@@ -2402,21 +2390,13 @@ probe syscall.lgetxattr = kernel.function("SyS_lgetxattr").call !,
                           kernel.function("sys_lgetxattr").call
 {
 	name = "lgetxattr"
-%( kernel_v >= "2.6.27" %?
-	path = user_string($pathname)
-%:
-	path = user_string($path)
-%)
+	path = user_string(@defined($pathname) ? $pathname : $path)
 	# FIXME
 	name2 = user_string($name)
 	value_uaddr = $value
 	size = $size
 	argstr = sprintf("%s, %s, %p, %d",
-%( kernel_v >= "2.6.27" %?
-		user_string_quoted($pathname),
-%:
-		user_string_quoted($path),
-%)
+		user_string_quoted(@defined($pathname) ? $pathname : $path),
 		user_string_quoted($name),
 		value_uaddr, size)
 }
@@ -2501,15 +2481,11 @@ probe syscall.listxattr = kernel.function("SyS_listxattr").call !,
 	name = "listxattr"
 	list_uaddr = $list
 	size = $size
-%( kernel_v >= "2.6.27" %?
-	path_uaddr = $pathname
-	path = user_string($pathname)
-	argstr = sprintf("%s, %p, %d", user_string_quoted($pathname), $list, $size)
-%:
-	path_uaddr = $path
-	path = user_string($path)
-	argstr = sprintf("%s, %p, %d", user_string_quoted($path), $list, $size)
-%)
+	path_uaddr = (@defined($pathname) ? $pathname : $path)
+	path = user_string(@defined($pathname) ? $pathname : $path)
+	argstr = sprintf("%s, %p, %d",
+		user_string_quoted(@defined($pathname) ? $pathname : $path),
+		$list, $size)
 }
 probe syscall.listxattr.return = kernel.function("SyS_listxattr").return !,
                                  kernel.function("sys_listxattr").return
@@ -2527,15 +2503,11 @@ probe syscall.llistxattr = kernel.function("SyS_llistxattr").call !,
 	name = "llistxattr"
 	list_uaddr = $list
 	size = $size
-%( kernel_v >= "2.6.27" %?
-	path_uaddr = $pathname
-	path = user_string($pathname)
-	argstr = sprintf("%s, %p, %d", user_string_quoted($pathname), $list, $size)
-%:
-	path_uaddr = $path
-	path = user_string($path)
-	argstr = sprintf("%s, %p, %d", user_string_quoted($path), $list, $size)
-%)
+	path_uaddr = (@defined($pathname) ? $pathname : $path)
+	path = user_string(@defined($pathname) ? $pathname : $path)
+	argstr = sprintf("%s, %p, %d",
+		user_string_quoted(@defined($pathname) ? $pathname : $path),
+		$list, $size)
 }
 probe syscall.llistxattr.return = kernel.function("SyS_llistxattr").return !,
                                   kernel.function("sys_llistxattr").return
@@ -2598,15 +2570,11 @@ probe syscall.lremovexattr = kernel.function("SyS_lremovexattr").call !,
 	name = "lremovexattr"
 	name_uaddr = $name
 	name2 = user_string($name)
-%( kernel_v >= "2.6.27" %?
-	path_uaddr = $pathname
-	path = user_string($pathname)
-	argstr = sprintf("%s, %s", user_string_quoted($pathname), user_string_quoted($name))
-%:
-	path_uaddr = $path
-	path = user_string($path)
-	argstr = sprintf("%s, %s", user_string_quoted($path), user_string_quoted($name))
-%)
+	path_uaddr = (@defined($pathname) ? $pathname : $path)
+	path = user_string(@defined($pathname) ? $pathname : $path)
+	argstr = sprintf("%s, %s",
+		user_string_quoted(@defined($pathname) ? $pathname : $path),
+		user_string_quoted($name))
 }
 probe syscall.lremovexattr.return = kernel.function("SyS_lremovexattr").return !,
                                     kernel.function("sys_lremovexattr").return
@@ -2646,24 +2614,15 @@ probe syscall.lsetxattr = kernel.function("SyS_lsetxattr").call !,
                           kernel.function("sys_lsetxattr").call
 {
 	name = "lsetxattr"
-%( kernel_v >= "2.6.27" %?
-	path_uaddr = $pathname
-	path = user_string($pathname)
-%:
-	path_uaddr = $path
-	path = user_string($path)
-%)
+	path_uaddr = (@defined($pathname) ? $pathname : $path)
+	path = user_string(@defined($pathname) ? $pathname : $path)
 	name_uaddr = $name
 	name_str = user_string($name)
 	value_uaddr = $value
 	size = $size
 	flags = $flags
 	argstr = sprintf("%s, %s, %p, %d, %d",
-%( kernel_v >= "2.6.27" %?
-			user_string_quoted($pathname),
-%:
-			user_string_quoted($path),
-%)
+			user_string_quoted(@defined($pathname) ? $pathname : $path),
 			user_string_quoted($name),
 			value_uaddr, $size, $flags)
 }
diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index 4fa7bac3..d6af4e21 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -1,6 +1,6 @@
 // syscalls tapset part 2 [N-Z]
 // Copyright (C) 2005 IBM Corp.
-// Copyright (C) 2005, 2006, 2007 Red Hat Inc.
+// Copyright (C) 2005, 2006, 2007, 2010 Red Hat Inc.
 // Copyright (C) 2007 Quentin Barnes.
 //
 // This file is part of systemtap, and is free software.  You can
@@ -350,12 +350,9 @@ probe syscall.poll = kernel.function("SyS_poll").call !,
 	name = "poll"
 	ufds_uaddr = $ufds
 	nfds = $nfds
-%( kernel_vr > "2.6.15-1.1831" %?
-	timeout = $timeout_msecs
-%:
-	timeout = $timeout
-%)
-	argstr = sprintf("%p, %d, %d", $ufds, $nfds, timeout)
+	timeout = (@defined($timeout_msecs) ? $timeout_msecs : $timeout)
+	argstr = sprintf("%p, %d, %d", $ufds, $nfds,
+		(@defined($timeout_msecs) ? $timeout_msecs : $timeout))
 }
 probe syscall.poll.return = kernel.function("SyS_poll").return !,
                             kernel.function("sys_poll").return
@@ -714,13 +711,10 @@ probe syscall.readlinkat = kernel.function("SyS_readlinkat").call !,
 	dfd = $dfd
 	buf_uaddr = $buf
 	bufsiz = $bufsiz
-%( kernel_v >= "2.6.27" %?
-	path = user_string($pathname)
-	argstr = sprintf("%s, %s, %p, %d", _dfd_str($dfd), user_string_quoted($pathname), $buf, $bufsiz)
-%:
-	path = user_string($path)
-	argstr = sprintf("%s, %s, %p, %d", _dfd_str($dfd), user_string_quoted($path), $buf, $bufsiz)
-%)
+	path = user_string(@defined($pathname) ? $pathname : $path)
+	argstr = sprintf("%s, %s, %p, %d", _dfd_str($dfd),
+		user_string_quoted(@defined($pathname) ? $pathname : $path),
+		$buf, $bufsiz)
 }
 
 probe syscall.readlinkat.return = kernel.function("SyS_readlinkat").return !,
@@ -891,11 +885,7 @@ probe syscall.remap_file_pages = kernel.function("SyS_remap_file_pages").call !,
 	name = "remap_file_pages"
 	start = $start
 	size = $size
-%( kernel_vr >= "2.6.24" %?
-	prot = $prot
-%:
-	prot = $__prot
-%)
+	prot = (@defined($prot) ? $prot : $__prot)
 	pgoff = $pgoff
 	flags = $flags
 	argstr = sprintf("%p, %p, %p, %p, %p", start, size, prot,
@@ -919,16 +909,11 @@ probe syscall.removexattr = kernel.function("SyS_removexattr").call !,
 {
 	name = "removexattr"
 	name_str = user_string($name)
-%( kernel_v >= "2.6.27" %?
-	path = user_string($pathname)
-	argstr = sprintf("%s, %s", user_string_quoted($pathname),
-		user_string_quoted($name))
-%:
-	path = user_string($path)
-	argstr = sprintf("%s, %s", user_string_quoted($path),
-		user_string_quoted($name))
-%)
 
+	path = user_string(@defined($pathname) ? $pathname : $path)
+	argstr = sprintf("%s, %s",
+		user_string_quoted(@defined($pathname) ? $pathname : $path),
+		user_string_quoted($name))
 }
 probe syscall.removexattr.return = kernel.function("SyS_removexattr").return !,
                                    kernel.function("sys_removexattr").return
@@ -2260,24 +2245,15 @@ probe syscall.setxattr = kernel.function("SyS_setxattr").call !,
                          kernel.function("sys_setxattr").call
 {
 	name = "setxattr"
-%( kernel_v >= "2.6.27" %?
-	path_uaddr = $pathname
-	path = user_string($pathname)
-%:
-	path_uaddr = $path
-	path = user_string($path)
-%)
+	path_uaddr = (@defined($pathname) ? $pathname : $path)
+	path = user_string(@defined($pathname) ? $pathname : $path)
 	name_uaddr = $name
 	name_str = user_string($name)
 	value_uaddr = $value
 	size = $size
 	flags = $flags
 	argstr = sprintf("%s, %s, %p, %d, %d",
-%( kernel_v >= "2.6.27" %?
-			user_string_quoted($pathname),
-%:
-			user_string_quoted($path),
-%)
+			user_string_quoted(@defined($pathname) ? $pathname : $path),
 			user_string_quoted($name),
 			value_uaddr, $size, $flags)
 }
@@ -2734,13 +2710,10 @@ probe syscall.statfs = kernel.function("compat_sys_statfs").call ?,
 {
 	name = "statfs"
 	buf_uaddr = $buf
-%( kernel_v >= "2.6.27" %?
-	path = user_string($pathname)
-	argstr = sprintf("%s, %p", user_string_quoted($pathname), $buf)
-%:
-	path = user_string($path)
-	argstr = sprintf("%s, %p", user_string_quoted($path), $buf)
-%)
+	path = user_string(@defined($pathname) ? $pathname : $path)
+	argstr = sprintf("%s, %p",
+		user_string_quoted(@defined($pathname) ? $pathname : $path),
+		$buf)
 }
 
 probe syscall.statfs.return = kernel.function("compat_sys_statfs").return ?,
@@ -2763,13 +2736,11 @@ probe syscall.statfs64 = kernel.function("compat_sys_statfs64").call ?,
 	name = "statfs"
 	sz = $sz
 	buf_uaddr = $buf
-%( kernel_v >= "2.6.27" %?
-	path = user_string($pathname)
-	argstr = sprintf("%s, %d, %p", user_string_quoted($pathname), $sz, $buf)
-%:
-	path = user_string($path)
-	argstr = sprintf("%s, %d, %p", user_string_quoted($path), $sz, $buf)
-%)
+
+	path = user_string(@defined($pathname) ? $pathname : $path)
+	argstr = sprintf("%s, %d, %p",
+		user_string_quoted(@defined($pathname) ? $pathname : $path),
+		$sz, $buf)
 }
 
 probe syscall.statfs64.return = kernel.function("compat_sys_statfs64").return ?,
@@ -3599,13 +3570,13 @@ probe syscall.wait4 = kernel.function("SyS_wait4").call !,
                       kernel.function("sys_wait4").call
 {
 	name = "wait4"
-	pid = %( kernel_vr >= "2.6.25" %? $upid %: $pid%)
+	pid = (@defined($upid) ? $upid : $pid)
 	status_uaddr = $stat_addr
 	options = $options
 	options_str = _wait4_opt_str($options)
 	rusage_uaddr = $ru
 	argstr = sprintf("%d, %p, %s, %p",
-		%( kernel_vr >= "2.6.25" %? $upid %: $pid%),
+		(@defined($upid) ? $upid : $pid),
 		$stat_addr, _wait4_opt_str($options), $ru)
 }
 probe syscall.wait4.return = kernel.function("SyS_wait4").return !,
@@ -3626,7 +3597,7 @@ probe syscall.waitid = kernel.function("SyS_waitid").call !,
                        kernel.function("sys_waitid").call
 {
 	name = "waitid"
-	pid = %( kernel_vr >= "2.6.25" %? $upid %: $pid%)
+	pid = (@defined($upid) ? $upid : $pid)
 	which = $which
 	which_str = _waitid_which_str($which)
 	infop_uaddr = $infop
@@ -3634,7 +3605,7 @@ probe syscall.waitid = kernel.function("SyS_waitid").call !,
 	options_str = _waitid_opt_str($options)
 	rusage_uaddr = $ru
 	argstr = sprintf("%d, %d, %p, %s, %p", $which,
-		%( kernel_vr >= "2.6.25" %? $upid %: $pid%), $infop,
+		(@defined($upid) ? $upid : $pid), $infop,
 		_waitid_opt_str($options), $ru)
 }
 probe syscall.waitid.return = kernel.function("SyS_waitid").return !,
diff --git a/tapset/x86_64/nd_syscalls.stp b/tapset/x86_64/nd_syscalls.stp
index 80c092a8..b0b0686c 100644
--- a/tapset/x86_64/nd_syscalls.stp
+++ b/tapset/x86_64/nd_syscalls.stp
@@ -30,11 +30,7 @@ probe nd_syscall.arch_prctl.return = kprobe.function("sys_arch_prctl").return
 probe nd_syscall.iopl = kprobe.function("sys_iopl")
 {
 	name = "iopl"
-// %( kernel_vr == "*xen" %?
-// 	level = $new_iopl
-// %:
-// 	level = $level
-// %)
+//	level = (@defined($level) ? $level : $new_iopl)
 	asmlinkage()
 	level = int_arg(1)
 	argstr = sprint(level)
@@ -177,17 +173,15 @@ probe nd_syscall.vm86_warning.return = kprobe.function("sys32_vm86_warning").ret
 #
 # long sys32_pipe(int __user *fd)
 #
-%(kernel_v < "2.6.32" %?
-probe nd_syscall.pipe32 = kprobe.function("sys32_pipe")
+probe nd_syscall.pipe32 = kprobe.function("sys32_pipe")?
 {
 	name = "pipe"
 	// argstr = sprintf("%p", $fd)
 	asmlinkage()
 	argstr = sprintf("%p", pointer_arg(1))
 }
-probe nd_syscall.pipe32.return = kprobe.function("sys32_pipe").return
+probe nd_syscall.pipe32.return = kprobe.function("sys32_pipe").return?
 {
 	name = "pipe"
 	retstr = returnstr(1)
 }
-%)
diff --git a/tapset/x86_64/syscalls.stp b/tapset/x86_64/syscalls.stp
index 28fa2969..bcb9523d 100644
--- a/tapset/x86_64/syscalls.stp
+++ b/tapset/x86_64/syscalls.stp
@@ -26,11 +26,7 @@ probe syscall.arch_prctl.return = kernel.function("sys_arch_prctl").return
 probe syscall.iopl = kernel.function("sys_iopl")
 {
 	name = "iopl"
-%( kernel_vr == "*xen" %?
-	level = $new_iopl
-%:
-	level = $level
-%)
+	level = (@defined($level) ? $level : $new_iopl)
 	argstr = sprint(level)
 }
 probe syscall.iopl.return = kernel.function("sys_iopl").return