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.
Showing the changes to include/uapi/linux (1 of 1 file). Show all
Unified · Split
| @@ -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) |