From: Dmitry V. Levin <ldv@altlinux.org>
Date: Mon, 26 Dec 2016 00:55:54 +0000 (+0000)
Subject: Redirect kernel_ureg_t and kernel_scno_t from unsigned long to kernel_ulong_t
X-Git-Tag: v4.16~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e625443bb501c99e3cbed7cf041ef3036c7955f0;p=strace

Redirect kernel_ureg_t and kernel_scno_t from unsigned long to kernel_ulong_t

* defs.h (struct tcb): Change u_rval type from long to kernel_long_t.
(PRI_krd, PRI_kru, PRI_krx): Redirect to PRI_kld, PRI_klu, and PRI_klx.
* kernel_types.h (kernel_scno_t, kernel_ureg_t): Redirect
to kernel_ulong_t.
---

diff --git a/defs.h b/defs.h
index 516f57b8..c79fb864 100644
--- a/defs.h
+++ b/defs.h
@@ -238,7 +238,7 @@ struct tcb {
 	unsigned long long ext_arg[MAX_ARGS];
 	long long u_lrval;	/* long long return value */
 #endif
-	long u_rval;		/* Return value */
+	kernel_long_t u_rval;	/* Return value */
 #if SUPPORTED_PERSONALITIES > 1
 	unsigned int currpers;	/* Personality at the time of scno update */
 #endif
@@ -985,9 +985,9 @@ scno_is_valid(kernel_scno_t scno)
 #define PRI_klu PRI_kl"u"
 #define PRI_klx PRI_kl"x"
 
-#define PRI_krd "ld"
-#define PRI_kru "lu"
-#define PRI_krx "lx"
+#define PRI_krd PRI_kld
+#define PRI_kru PRI_klu
+#define PRI_krx PRI_klx
 
 /*
  * The kernel used to define 64-bit types on 64-bit systems on a per-arch
diff --git a/kernel_types.h b/kernel_types.h
index c54af74e..66c20831 100644
--- a/kernel_types.h
+++ b/kernel_types.h
@@ -47,8 +47,8 @@ typedef unsigned long kernel_ulong_t;
 
 # endif
 
-typedef unsigned long kernel_scno_t;
-typedef unsigned long kernel_ureg_t;
+typedef kernel_ulong_t kernel_scno_t;
+typedef kernel_ulong_t kernel_ureg_t;
 
 typedef struct {
 	kernel_ulong_t	d_ino;