Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull more x32 uabi type fixes from Peter Anvin: "Despite the branch name, **most of these changes are to generic code**. They change types so that they make an increasing amount of the exported uapi kernel headers usable for libc. The ARM64 people are also interested in these changes for their ILP32 ABI" * 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: uapi: Use __kernel_long_t in struct mq_attr uapi: Use __kernel_ulong_t in shmid64_ds/shminfo64/shm_info x86, uapi, x32: Use __kernel_ulong_t in x86 struct semid64_ds uapi: Use __kernel_ulong_t in struct msqid64_ds uapi: Use __kernel_long_t in struct msgbuf uapi, asm-generic: Use __kernel_ulong_t in uapi struct ipc64_perm uapi: Use __kernel_long_t/__kernel_ulong_t in <linux/resource.h> uapi: Use __kernel_long_t in struct timex

Linus Torvalds committed 12 years ago

Commit cca21642 parents e914e3f 63159f59 files · +69 −69Browse files

Showing the changes to include/uapi/linux (5 of 9 files). Show all

Unified · Split

5 files

include/uapi/linux/mqueue.h +5 −5
include/uapi/linux/msg.h +2 −2
include/uapi/linux/resource.h +16 −16
include/uapi/linux/shm.h +5 −5
include/uapi/linux/timex.h +17 −17

include/uapi/linux/mqueue.h+5−5

@@ -23,11 +23,11 @@ · 22 unmodified lines
23	23	#define MQ_BYTES_MAX 819200
24	24
25	25	struct mq_attr {
26		− long mq_flags; /* message queue flags */
27		− long mq_maxmsg; /* maximum number of messages */
28		− long mq_msgsize; /* maximum message size */
29		− long mq_curmsgs; /* number of messages currently queued */
30		− long __reserved[4]; /* ignored for input, zeroed for output */
	26	+ __kernel_long_t mq_flags; /* message queue flags */
	27	+ __kernel_long_t mq_maxmsg; /* maximum number of messages */
	28	+ __kernel_long_t mq_msgsize; /* maximum message size */
	29	+ __kernel_long_t mq_curmsgs; /* number of messages currently queued */
	30	+ __kernel_long_t __reserved[4]; /* ignored for input, zeroed for output */
31	31	};
32	32
33	33	/*

include/uapi/linux/msg.h+2−2

@@ -34,8 +34,8 @@ struct msqid_ds { · 33 unmodified lines
34	34
35	35	/* message buffer for msgsnd and msgrcv calls */
36	36	struct msgbuf {
37		− long mtype; /* type of message */
38		− char mtext[1]; /* message text */
	37	+ __kernel_long_t mtype; /* type of message */
	38	+ char mtext[1]; /* message text */
39	39	};
40	40
41	41	/* buffer for msgctl calls IPC_INFO, MSG_INFO */

include/uapi/linux/resource.h+16−16

@@ -23,25 +23,25 @@ · 22 unmodified lines
23	23	struct rusage {
24	24	struct timeval ru_utime; /* user time used */
25	25	struct timeval ru_stime; /* system time used */
26		− long ru_maxrss; /* maximum resident set size */
27		− long ru_ixrss; /* integral shared memory size */
28		− long ru_idrss; /* integral unshared data size */
29		− long ru_isrss; /* integral unshared stack size */
30		− long ru_minflt; /* page reclaims */
31		− long ru_majflt; /* page faults */
32		− long ru_nswap; /* swaps */
33		− long ru_inblock; /* block input operations */
34		− long ru_oublock; /* block output operations */
35		− long ru_msgsnd; /* messages sent */
36		− long ru_msgrcv; /* messages received */
37		− long ru_nsignals; /* signals received */
38		− long ru_nvcsw; /* voluntary context switches */
39		− long ru_nivcsw; /* involuntary " */
	26	+ __kernel_long_t ru_maxrss; /* maximum resident set size */
	27	+ __kernel_long_t ru_ixrss; /* integral shared memory size */
	28	+ __kernel_long_t ru_idrss; /* integral unshared data size */
	29	+ __kernel_long_t ru_isrss; /* integral unshared stack size */
	30	+ __kernel_long_t ru_minflt; /* page reclaims */
	31	+ __kernel_long_t ru_majflt; /* page faults */
	32	+ __kernel_long_t ru_nswap; /* swaps */
	33	+ __kernel_long_t ru_inblock; /* block input operations */
	34	+ __kernel_long_t ru_oublock; /* block output operations */
	35	+ __kernel_long_t ru_msgsnd; /* messages sent */
	36	+ __kernel_long_t ru_msgrcv; /* messages received */
	37	+ __kernel_long_t ru_nsignals; /* signals received */
	38	+ __kernel_long_t ru_nvcsw; /* voluntary context switches */
	39	+ __kernel_long_t ru_nivcsw; /* involuntary " */
40	40	};
41	41
42	42	struct rlimit {
43		− unsigned long rlim_cur;
44		− unsigned long rlim_max;
	43	+ __kernel_ulong_t rlim_cur;
	44	+ __kernel_ulong_t rlim_max;
45	45	};
46	46
47	47	#define RLIM64_INFINITY (~0ULL)

include/uapi/linux/shm.h+5−5

@@ -68,11 +68,11 @@ struct shminfo { · 67 unmodified lines
68	68
69	69	struct shm_info {
70	70	int used_ids;
71		− unsigned long shm_tot; /* total allocated shm */
72		− unsigned long shm_rss; /* total resident shm */
73		− unsigned long shm_swp; /* total swapped shm */
74		− unsigned long swap_attempts;
75		− unsigned long swap_successes;
	71	+ __kernel_ulong_t shm_tot; /* total allocated shm */
	72	+ __kernel_ulong_t shm_rss; /* total resident shm */
	73	+ __kernel_ulong_t shm_swp; /* total swapped shm */
	74	+ __kernel_ulong_t swap_attempts;
	75	+ __kernel_ulong_t swap_successes;
76	76	};
77	77
78	78

include/uapi/linux/timex.h+17−17

@@ -63,27 +63,27 @@ · 62 unmodified lines
63	63	*/
64	64	struct timex {
65	65	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) */
70	70	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	+ */
76	76	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 */
78	78
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) */
81	81	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) */
87	87
88	88	int tai; /* TAI offset (ro) */
89	89