Use __kernel_long_t in struct timex
PATCH 1/1 Use __kernel_long_t in struct timex
X32 adjtimex system call is the same as x86-64 adjtimex system call, which uses 64-bit integer for long in struct timex. But x32 long is 32 bit. This patch replaces long in struct timex with __kernel_long_t.
--- include/uapi/linux/timex.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
include/uapi/linux/timex.h +17 -17
@@ -63,27 +63,27 @@*/ struct timex {unsigned int modes;/* mode selector */ -long offset;/* time offset (usec) */ -long freq;/* frequency offset (scaled ppm) */ -long maxerror;/* maximum error (usec) */ -long esterror;/* estimated error (usec) */ +__kernel_long_t offset;/* time offset (usec) */ +__kernel_long_t freq;/* frequency offset (scaled ppm) */ +__kernel_long_t maxerror;/* maximum error (usec) */ +__kernel_long_t esterror;/* estimated error (usec) */ int status;/* clock command/status */ -long constant;/* pll time constant */ -long precision;/* clock precision (usec) (read only) */ -long tolerance;/* clock frequency tolerance (ppm) -* (read only) -*/ +__kernel_long_t constant;/* pll time constant */ +__kernel_long_t precision;/* clock precision (usec) (read only) */ +__kernel_long_t tolerance;/* clock frequency tolerance (ppm) +* (read only) +*/ struct timeval time;/* (read only, except for ADJ_SETOFFSET) */ -long tick;/* (modified) usecs between clock ticks */ +__kernel_long_t tick;/* (modified) usecs between clock ticks */ -long ppsfreq;/* pps frequency (scaled ppm) (ro) */ -long jitter;/* pps jitter (us) (ro) */ +__kernel_long_t ppsfreq;/* pps frequency (scaled ppm) (ro) */ +__kernel_long_t jitter;/* pps jitter (us) (ro) */ int shift;/* interval duration (s) (shift) (ro) */ -long stabil;/* pps stability (scaled ppm) (ro) */ -long jitcnt;/* jitter limit exceeded (ro) */ -long calcnt;/* calibration intervals (ro) */ -long errcnt;/* calibration errors (ro) */ -long stbcnt;/* stability limit exceeded (ro) */ +__kernel_long_t stabil;/* pps stability (scaled ppm) (ro) */ +__kernel_long_t jitcnt;/* jitter limit exceeded (ro) */ +__kernel_long_t calcnt;/* calibration intervals (ro) */ +__kernel_long_t errcnt;/* calibration errors (ro) */ +__kernel_long_t stbcnt;/* stability limit exceeded (ro) */ int tai;/* TAI offset (ro) */
Signature · 1 line
1.8.4.2
Quoted 4 lines · H.J. Lu
X32 adjtimex system call is the same as x86-64 adjtimex system call, which uses 64-bit integer for long in struct timex. But x32 long is 32 bit. This patch replaces long in struct timex with
__kernel_long_t.
Here is the updated patch which uses __kernel_long_t only if __BITS_PER_LONG == 64.
H.J.
Quoted 8 lines · H.J. Lu
Quoted 4 lines · H.J. Lu
X32 adjtimex system call is the same as x86-64 adjtimex system call, which uses 64-bit integer for long in struct timex. But x32 long is 32 bit. This patch replaces long in struct timex with
__kernel_long_t.Here is the updated patch which uses
__kernel_long_tonly if__BITS_PER_LONG== 64.
Forgot to include the new patch. Here it is.
H.J.
Quoted 1 line
From
fd1986128a354cf9fb3786b0138e7b84690d9835Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <[email protected]>
Date: Tue, 24 Dec 2013 16:20:28 -0800
Subject: [PATCH] Use __kernel_long_t in struct timex
X32 adjtimex system call is the same as x86-64 adjtimex system call, which uses 64-bit integer for long in struct timex. But x32 long is 32 bit. This patch replaces long in struct timex with __kernel_long_t if __BITS_PER_LONG == 64.
--- include/uapi/linux/timex.h | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-)
include/uapi/linux/timex.h +38 -8
@@ -63,28 +63,58 @@*/ struct timex {unsigned int modes;/* mode selector */ +#if __BITS_PER_LONG ==64 +__kernel_long_t offset;/* time offset (usec) */ +__kernel_long_t freq;/* frequency offset (scaled ppm) */ +__kernel_long_t maxerror;/* maximum error (usec) */ +__kernel_long_t esterror;/* estimated error (usec) */ +#else long offset;/* time offset (usec) */ long freq;/* frequency offset (scaled ppm) */ long maxerror;/* maximum error (usec) */ long esterror;/* estimated error (usec) */ +#endif int status;/* clock command/status */ +#if __BITS_PER_LONG ==64 +__kernel_long_t constant;/* pll time constant */ +__kernel_long_t precision;/* clock precision (usec) (read only) */ +__kernel_long_t tolerance;/* clock frequency tolerance (ppm) +* (read only) +*/ +#else long constant;/* pll time constant */ long precision;/* clock precision (usec) (read only) */ long tolerance;/* clock frequency tolerance (ppm) * (read only) */ +#endif struct timeval time;/* (read only, except for ADJ_SETOFFSET) */ +#if __BITS_PER_LONG ==64 +__kernel_long_t tick;/* (modified) usecs between clock ticks */ + +__kernel_long_t ppsfreq;/* pps frequency (scaled ppm) (ro) */ +__kernel_long_t jitter;/* pps jitter (us) (ro) */ +#else long tick;/* (modified) usecs between clock ticks */ -long ppsfreq;/* pps frequency (scaled ppm) (ro) */ -long jitter;/* pps jitter (us) (ro) */ +long ppsfreq;/* pps frequency (scaled ppm) (ro) */ +long jitter;/* pps jitter (us) (ro) */ +#endif int shift;/* interval duration (s) (shift) (ro) */ -long stabil;/* pps stability (scaled ppm) (ro) */ -long jitcnt;/* jitter limit exceeded (ro) */ -long calcnt;/* calibration intervals (ro) */ -long errcnt;/* calibration errors (ro) */ -long stbcnt;/* stability limit exceeded (ro) */ - +#if __BITS_PER_LONG ==64 +__kernel_long_t stabil;/* pps stability (scaled ppm) (ro) */ +__kernel_long_t jitcnt;/* jitter limit exceeded (ro) */ +__kernel_long_t calcnt;/* calibration intervals (ro) */ +__kernel_long_t errcnt;/* calibration errors (ro) */ +__kernel_long_t stbcnt;/* stability limit exceeded (ro) */ + +#else +long stabil;/* pps stability (scaled ppm) (ro) */ +long jitcnt;/* jitter limit exceeded (ro) */ +long calcnt;/* calibration intervals (ro) */ +long errcnt;/* calibration errors (ro) */ +long stbcnt;/* stability limit exceeded (ro) */ +#endif int tai;/* TAI offset (ro) */ int :32; int :32; int :32; int :32;
Signature · 1 line
1.8.4.2