From: Mark Wielaard <mjw@redhat.com>
Date: Sun, 21 Oct 2012 23:37:51 +0000 (+0200)
Subject: Adjust buildok/xtime.stp for kernel commit 1e75f.
X-Git-Tag: release-2.1~343
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=5474cb6806a10fd7c88f79b25ec5e26a15bee2b3;p=systemtap.git

Adjust buildok/xtime.stp for kernel commit 1e75f.

time: Condense timekeeper.xtime into xtime_sec.
---

diff --git a/testsuite/buildok/xtime.stp b/testsuite/buildok/xtime.stp
index 1673111b5..6464566cc 100755
--- a/testsuite/buildok/xtime.stp
+++ b/testsuite/buildok/xtime.stp
@@ -4,7 +4,8 @@
 probe kernel.function("do_gettimeofday")
 {
   printf("xtime.tv_sec:%d\n",
-	 (@defined($timekeeper->xtime->tv_sec) ? $timekeeper->xtime->tv_sec
-	  : $xtime->tv_sec))
+	 (@defined($timekeeper->xtime_sec) ? $timekeeper->xtime_sec
+          : (@defined($timekeeper->xtime->tv_sec) ? $timekeeper->xtime->tv_sec
+	     : $xtime->tv_sec)))
   exit();
 }