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.

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Link: http://lkml.kernel.org/r/1388182464-28428-2-git-send-email-hjl.tools@gmail.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --git a/include/uapi/linux/timex.h b/include/uapi/linux/timex.h
index a7ea81f13711e80f68cf52b6a626d7a09461886e..92685d8264449c515d69652ad6c9fc23eae28344 100644 (file)
--- a/include/uapi/linux/timex.h
+++ b/include/uapi/linux/timex.h
@@ -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) */