diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2013-12-27 17:14:23 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2014-01-20 17:45:25 -0500 |
commit | f8dcdf0130d3ba34f8f7531af7c45616efe1e32e (patch) | |
tree | d4c8ea7597c8585e66a6579136d850256f41c2ea /include/uapi/asm-generic | |
parent | 386916598e901e406c1f1fc801ade2646a1e8137 (diff) |
uapi: Use __kernel_ulong_t in shmid64_ds/shminfo64/shm_info
Both x32 and x86-64 use the same struct shmid64_ds/shminfo64/shm_info for
system calls. But x32 long is 32-bit. This patch replaces unsigned long
with __kernel_ulong_t in struct shmid64_ds/shminfo64/shm_info.
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Link: http://lkml.kernel.org/r/1388182464-28428-8-git-send-email-hjl.tools@gmail.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'include/uapi/asm-generic')
-rw-r--r-- | include/uapi/asm-generic/shmbuf.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/uapi/asm-generic/shmbuf.h b/include/uapi/asm-generic/shmbuf.h index 5768fa60ac82..7e9fb2f0853b 100644 --- a/include/uapi/asm-generic/shmbuf.h +++ b/include/uapi/asm-generic/shmbuf.h | |||
@@ -39,21 +39,21 @@ struct shmid64_ds { | |||
39 | #endif | 39 | #endif |
40 | __kernel_pid_t shm_cpid; /* pid of creator */ | 40 | __kernel_pid_t shm_cpid; /* pid of creator */ |
41 | __kernel_pid_t shm_lpid; /* pid of last operator */ | 41 | __kernel_pid_t shm_lpid; /* pid of last operator */ |
42 | unsigned long shm_nattch; /* no. of current attaches */ | 42 | __kernel_ulong_t shm_nattch; /* no. of current attaches */ |
43 | unsigned long __unused4; | 43 | __kernel_ulong_t __unused4; |
44 | unsigned long __unused5; | 44 | __kernel_ulong_t __unused5; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | struct shminfo64 { | 47 | struct shminfo64 { |
48 | unsigned long shmmax; | 48 | __kernel_ulong_t shmmax; |
49 | unsigned long shmmin; | 49 | __kernel_ulong_t shmmin; |
50 | unsigned long shmmni; | 50 | __kernel_ulong_t shmmni; |
51 | unsigned long shmseg; | 51 | __kernel_ulong_t shmseg; |
52 | unsigned long shmall; | 52 | __kernel_ulong_t shmall; |
53 | unsigned long __unused1; | 53 | __kernel_ulong_t __unused1; |
54 | unsigned long __unused2; | 54 | __kernel_ulong_t __unused2; |
55 | unsigned long __unused3; | 55 | __kernel_ulong_t __unused3; |
56 | unsigned long __unused4; | 56 | __kernel_ulong_t __unused4; |
57 | }; | 57 | }; |
58 | 58 | ||
59 | #endif /* __ASM_GENERIC_SHMBUF_H */ | 59 | #endif /* __ASM_GENERIC_SHMBUF_H */ |