Commit b684bfed authored by H.J. Lu's avatar H.J. Lu Committed by H. Peter Anvin

uapi: Use __kernel_long_t/__kernel_ulong_t in <linux/resource.h>

Both x32 and x86-64 use the same struct rusage and struct rlimit for
system calls.  But x32 log is 32-bit.  This patch change uapi
<linux/resource.h> to use __kernel_long_t in struct rusage and
__kernel_ulong_t in and struct rlimit.
Signed-off-by: default avatarH.J. Lu <hjl.tools@gmail.com>
Link: http://lkml.kernel.org/r/1388182464-28428-3-git-send-email-hjl.tools@gmail.comSigned-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 7fb30128
...@@ -23,25 +23,25 @@ ...@@ -23,25 +23,25 @@
struct rusage { struct rusage {
struct timeval ru_utime; /* user time used */ struct timeval ru_utime; /* user time used */
struct timeval ru_stime; /* system time used */ struct timeval ru_stime; /* system time used */
long ru_maxrss; /* maximum resident set size */ __kernel_long_t ru_maxrss; /* maximum resident set size */
long ru_ixrss; /* integral shared memory size */ __kernel_long_t ru_ixrss; /* integral shared memory size */
long ru_idrss; /* integral unshared data size */ __kernel_long_t ru_idrss; /* integral unshared data size */
long ru_isrss; /* integral unshared stack size */ __kernel_long_t ru_isrss; /* integral unshared stack size */
long ru_minflt; /* page reclaims */ __kernel_long_t ru_minflt; /* page reclaims */
long ru_majflt; /* page faults */ __kernel_long_t ru_majflt; /* page faults */
long ru_nswap; /* swaps */ __kernel_long_t ru_nswap; /* swaps */
long ru_inblock; /* block input operations */ __kernel_long_t ru_inblock; /* block input operations */
long ru_oublock; /* block output operations */ __kernel_long_t ru_oublock; /* block output operations */
long ru_msgsnd; /* messages sent */ __kernel_long_t ru_msgsnd; /* messages sent */
long ru_msgrcv; /* messages received */ __kernel_long_t ru_msgrcv; /* messages received */
long ru_nsignals; /* signals received */ __kernel_long_t ru_nsignals; /* signals received */
long ru_nvcsw; /* voluntary context switches */ __kernel_long_t ru_nvcsw; /* voluntary context switches */
long ru_nivcsw; /* involuntary " */ __kernel_long_t ru_nivcsw; /* involuntary " */
}; };
struct rlimit { struct rlimit {
unsigned long rlim_cur; __kernel_ulong_t rlim_cur;
unsigned long rlim_max; __kernel_ulong_t rlim_max;
}; };
#define RLIM64_INFINITY (~0ULL) #define RLIM64_INFINITY (~0ULL)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment