From a342ddea303699d1fa8129108bfdf216cac6e11b Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Fri, 30 May 2014 10:56:53 -0500
Subject: [PATCH] Update syscall tapset for rawhide
 (3.15.0-0.rc5.git3.1.fc21.x86_64).

* tapset/linux/syscalls.stp (syscall.ioctl): Update for rawhide.
* tapset/linux/syscalls2.stp (syscall.compat_utime): Ditto.
---
 tapset/linux/syscalls.stp  | 4 ++--
 tapset/linux/syscalls2.stp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tapset/linux/syscalls.stp b/tapset/linux/syscalls.stp
index 6389f79e7..095e8018c 100644
--- a/tapset/linux/syscalls.stp
+++ b/tapset/linux/syscalls.stp
@@ -2262,8 +2262,8 @@ probe syscall.ioctl = kernel.function("compat_sys_ioctl").call ?,
 	name = "ioctl"
 	fd = $fd
 	request = $cmd
-	argp = $arg
-	argstr = sprintf("%d, %d, %p", $fd, $cmd, $arg)
+	argp = @choose_defined($arg, $arg32)
+	argstr = sprintf("%d, %d, %p", $fd, $cmd, argp)
 }
 probe syscall.ioctl.return = kernel.function("compat_sys_ioctl").return ?,
                              kernel.function("sys_ioctl").return ?
diff --git a/tapset/linux/syscalls2.stp b/tapset/linux/syscalls2.stp
index 359c359f2..c847743d6 100644
--- a/tapset/linux/syscalls2.stp
+++ b/tapset/linux/syscalls2.stp
@@ -3982,8 +3982,8 @@ probe syscall.compat_utime = kernel.function("compat_sys_utime").call ?
 	filename_uaddr = $filename
 	filename = user_string_quoted($filename)
 	buf_uaddr = $t
-	actime = user_long(&$t->actime)
-	modtime = user_long(&$t->modtime)
+	actime = _struct_compat_utimbuf_actime(buf_uaddr)
+	modtime = _struct_compat_utimbuf_modtime(buf_uaddr)
 	argstr = sprintf("%s, [%s, %s]", user_string_quoted($filename),
 		ctime(actime), ctime(modtime))
 }
-- 
2.43.5