History

uapi: 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.

H.J. Lu committed 12 years ago

Commit 7fb30121 parent 79dbbc61 file · +17 −17Browse files

Showing the changes to include/uapi/linux (1 of 1 file). Show all

Unified · Split

include/uapi/linux/timex.h+17−17
@@ -63,27 +63,27 @@ · 62 unmodified lines
6363 */
6464 struct timex {
6565 unsigned int modes; /* mode selector */
66− long offset; /* time offset (usec) */
67− long freq; /* frequency offset (scaled ppm) */
68− long maxerror; /* maximum error (usec) */
69− long esterror; /* estimated error (usec) */
66+ __kernel_long_t offset; /* time offset (usec) */
67+ __kernel_long_t freq; /* frequency offset (scaled ppm) */
68+ __kernel_long_t maxerror;/* maximum error (usec) */
69+ __kernel_long_t esterror;/* estimated error (usec) */
7070 int status; /* clock command/status */
71− long constant; /* pll time constant */
72− long precision; /* clock precision (usec) (read only) */
73− long tolerance; /* clock frequency tolerance (ppm)
74− * (read only)
75− */
71+ __kernel_long_t constant;/* pll time constant */
72+ __kernel_long_t precision;/* clock precision (usec) (read only) */
73+ __kernel_long_t tolerance;/* clock frequency tolerance (ppm)
74+ * (read only)
75+ */
7676 struct timeval time; /* (read only, except for ADJ_SETOFFSET) */
77− long tick; /* (modified) usecs between clock ticks */
77+ __kernel_long_t tick; /* (modified) usecs between clock ticks */
7878
79− long ppsfreq; /* pps frequency (scaled ppm) (ro) */
80− long jitter; /* pps jitter (us) (ro) */
79+ __kernel_long_t ppsfreq;/* pps frequency (scaled ppm) (ro) */
80+ __kernel_long_t jitter; /* pps jitter (us) (ro) */
8181 int shift; /* interval duration (s) (shift) (ro) */
82− long stabil; /* pps stability (scaled ppm) (ro) */
83− long jitcnt; /* jitter limit exceeded (ro) */
84− long calcnt; /* calibration intervals (ro) */
85− long errcnt; /* calibration errors (ro) */
86− long stbcnt; /* stability limit exceeded (ro) */
82+ __kernel_long_t stabil; /* pps stability (scaled ppm) (ro) */
83+ __kernel_long_t jitcnt; /* jitter limit exceeded (ro) */
84+ __kernel_long_t calcnt; /* calibration intervals (ro) */
85+ __kernel_long_t errcnt; /* calibration errors (ro) */
86+ __kernel_long_t stbcnt; /* stability limit exceeded (ro) */
8787
8888 int tai; /* TAI offset (ro) */
8989