From: Frank Ch. Eigler <fche@redhat.com>
Date: Wed, 11 Dec 2019 20:28:46 +0000 (-0500)
Subject: tapset: _struct_compat_timex_u() support after renaming to old_timex32
X-Git-Tag: release-4.3~119
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=4ab42baafca69953229422923ec0721abebb570f;p=systemtap.git

tapset: _struct_compat_timex_u() support after renaming to old_timex32

Kernel commit 4d5f007eedb74d (v5.1+) renames the old compat_timex
structure to old_timex32.
---

diff --git a/tapset/linux/aux_syscalls.stp b/tapset/linux/aux_syscalls.stp
index 3e7e464f5..4c39678c6 100644
--- a/tapset/linux/aux_syscalls.stp
+++ b/tapset/linux/aux_syscalls.stp
@@ -5282,7 +5282,10 @@ function _struct_timex_u:string(uaddr:long)
 
 function _struct_compat_timex_u:string(uaddr:long)
 %{ /* pure */
-#ifdef CONFIG_COMPAT
+#if defined(CONFIG_COMPAT)
+#if defined(CONFIG_COMPAT_32BIT_TIME)
+#define compat_timex old_timex32
+#endif
 	struct compat_timex ts;
 	char *ptr = (char *)(uintptr_t)STAP_ARG_uaddr;
 	int len;
@@ -5310,6 +5313,9 @@ function _struct_compat_timex_u:string(uaddr:long)
 			         (unsigned long)ptr);
 		}
 	}
+#if defined(CONFIG_COMPAT_32BIT_TIME)
+#undef compat_timex
+#endif
 #endif
 %}