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/linux | |
| 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/linux')
| -rw-r--r-- | include/uapi/linux/shm.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/uapi/linux/shm.h b/include/uapi/linux/shm.h index ec36fa1a83a4..78b69413f582 100644 --- a/include/uapi/linux/shm.h +++ b/include/uapi/linux/shm.h | |||
| @@ -68,11 +68,11 @@ struct shminfo { | |||
| 68 | 68 | ||
| 69 | struct shm_info { | 69 | struct shm_info { |
| 70 | int used_ids; | 70 | int used_ids; |
| 71 | unsigned long shm_tot; /* total allocated shm */ | 71 | __kernel_ulong_t shm_tot; /* total allocated shm */ |
| 72 | unsigned long shm_rss; /* total resident shm */ | 72 | __kernel_ulong_t shm_rss; /* total resident shm */ |
| 73 | unsigned long shm_swp; /* total swapped shm */ | 73 | __kernel_ulong_t shm_swp; /* total swapped shm */ |
| 74 | unsigned long swap_attempts; | 74 | __kernel_ulong_t swap_attempts; |
| 75 | unsigned long swap_successes; | 75 | __kernel_ulong_t swap_successes; |
| 76 | }; | 76 | }; |
| 77 | 77 | ||
| 78 | 78 | ||
