Merge commit 'origin/master' into pr6429-comp-unwindsyms

* commit 'origin/master':
  Fix assignment optimization expected results.
  PR6538: more testsuite tweaks for read-only warnings
  PR6538: more tapset fixes
  PR6538: explain why absentstats.stp logs will contain warnings
  PR6538: fix treatment of initialized globals
  Use pointer_arg to fetch arguments for syscall.utime and compat_utime.
  Optimize compound and binary expression assignments.
  Check new (sub) functions of _struct_utimbuf_* and _struct_compat_utimbuf_*.
  PR6538: tapset changes
  PR6538: testsuite changes
  PR5001: fix test suite collateral damage
  PR6538: warn about read-only variables
  Add some scripts and descriptions to the systemtap.examples.
  PR5001: Remove _stp_ctime and always use ctime.
  Use tr1/unordered_map instead of the deprecated ext/hash_map.
  PR6524: ctime() on bad values hangs system.
  Optimize away assignments in other contexts.
  Optimize away assignments in other contexts.
  dummy commit for testing systemtap-cvs notification
  Remove sa_restorer initialization.

1 files changed, 15 insertions, 11 deletions

diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index 558e89bb..0db50347 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -1364,7 +1364,7 @@ probe syscall.semtimedop.return = kernel.function("sys_semtimedop").return ? {
 probe syscall.compat_sys_semtimedop = kernel.function("compat_sys_semtimedop") ? {
 	name = "compat_sys_semtimedop"
 	semid = $semid
-	sops_uaddr = tsems
+	sops_uaddr = $tsems
 	nsops = $nsops
 	timeout_uaddr = $timeout
 	argstr = sprintf("%d, %p, %d, %s", $semid, $tsems, $nsops,
@@ -2897,11 +2897,13 @@ probe syscall.ustat.return =
 # long sys_utime(char __user * filename, struct utimbuf __user * times)
 probe syscall.utime = kernel.function("sys_utime") ? {
 	name = "utime"
-	filename_uaddr = $filename
-	filename = user_string($filename)
-	buf_uaddr = $times
-	buf_str = _struct_utimbuf_u($times)
-	argstr = sprintf("%s, %s", user_string_quoted($filename), buf_str)
+	filename_uaddr = pointer_arg(1)
+	filename = user_string_quoted(filename_uaddr)
+	buf_uaddr = pointer_arg(2)
+	actime = _struct_utimbuf_actime(buf_uaddr)
+	modtime = _struct_utimbuf_modtime(buf_uaddr)
+	argstr = sprintf("%s, [%s, %s]", filename,
+	       	 	 ctime(actime), ctime(modtime))
 }
 probe syscall.utime.return = kernel.function("sys_utime").return ? {
 	name = "utime"
@@ -2911,11 +2913,13 @@ probe syscall.utime.return = kernel.function("sys_utime").return ? {
 # long compat_sys_utime(char __user *filename, struct compat_utimbuf __user *t)
 probe syscall.compat_utime = kernel.function("compat_sys_utime") ? {
 	name = "utime"
-	filename_uaddr = $filename
-	filename = user_string($filename)
-	buf_uaddr = $t
-	buf_str = _struct_compat_utimbuf_u($t)
-	argstr = sprintf("%s, %s", user_string_quoted($filename), _struct_compat_utimbuf_u($t))
+	filename_uaddr = pointer_arg(1)
+	filename = user_string_quoted(filename_uaddr)
+	buf_uaddr = pointer_arg(2)
+	actime = _struct_compat_utimbuf_actime(buf_uaddr)
+	modtime = _struct_compat_utimbuf_modtime(buf_uaddr)
+	argstr = sprintf("%s, [%s, %s]", filename,
+	       	 	 ctime(actime), ctime(modtime))
 }
 probe syscall.compat_utime.return = kernel.function("compat_sys_utime").return ? {
 	name = "utime"