lkml.org 
[lkml]   [2014]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/x32] uapi: Use __kernel_long_t/__kernel_ulong_t in < linux/resource.h>
    Commit-ID:  b684bfedc94d4b2efff09dc499a9985321c482f5
    Gitweb: http://git.kernel.org/tip/b684bfedc94d4b2efff09dc499a9985321c482f5
    Author: H.J. Lu <hjl.tools@gmail.com>
    AuthorDate: Fri, 27 Dec 2013 14:14:18 -0800
    Committer: H. Peter Anvin <hpa@zytor.com>
    CommitDate: Mon, 20 Jan 2014 14:44:17 -0800

    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: H.J. Lu <hjl.tools@gmail.com>
    Link: http://lkml.kernel.org/r/1388182464-28428-3-git-send-email-hjl.tools@gmail.com
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    ---
    include/uapi/linux/resource.h | 32 ++++++++++++++++----------------
    1 file changed, 16 insertions(+), 16 deletions(-)

    diff --git a/include/uapi/linux/resource.h b/include/uapi/linux/resource.h
    index e0ed284..36fb3b5 100644
    --- a/include/uapi/linux/resource.h
    +++ b/include/uapi/linux/resource.h
    @@ -23,25 +23,25 @@
    struct rusage {
    struct timeval ru_utime; /* user time used */
    struct timeval ru_stime; /* system time used */
    - long ru_maxrss; /* maximum resident set size */
    - long ru_ixrss; /* integral shared memory size */
    - long ru_idrss; /* integral unshared data size */
    - long ru_isrss; /* integral unshared stack size */
    - long ru_minflt; /* page reclaims */
    - long ru_majflt; /* page faults */
    - long ru_nswap; /* swaps */
    - long ru_inblock; /* block input operations */
    - long ru_oublock; /* block output operations */
    - long ru_msgsnd; /* messages sent */
    - long ru_msgrcv; /* messages received */
    - long ru_nsignals; /* signals received */
    - long ru_nvcsw; /* voluntary context switches */
    - long ru_nivcsw; /* involuntary " */
    + __kernel_long_t ru_maxrss; /* maximum resident set size */
    + __kernel_long_t ru_ixrss; /* integral shared memory size */
    + __kernel_long_t ru_idrss; /* integral unshared data size */
    + __kernel_long_t ru_isrss; /* integral unshared stack size */
    + __kernel_long_t ru_minflt; /* page reclaims */
    + __kernel_long_t ru_majflt; /* page faults */
    + __kernel_long_t ru_nswap; /* swaps */
    + __kernel_long_t ru_inblock; /* block input operations */
    + __kernel_long_t ru_oublock; /* block output operations */
    + __kernel_long_t ru_msgsnd; /* messages sent */
    + __kernel_long_t ru_msgrcv; /* messages received */
    + __kernel_long_t ru_nsignals; /* signals received */
    + __kernel_long_t ru_nvcsw; /* voluntary context switches */
    + __kernel_long_t ru_nivcsw; /* involuntary " */
    };

    struct rlimit {
    - unsigned long rlim_cur;
    - unsigned long rlim_max;
    + __kernel_ulong_t rlim_cur;
    + __kernel_ulong_t rlim_max;
    };

    #define RLIM64_INFINITY (~0ULL)

    \
     
     \ /
      Last update: 2014-01-21 06:46    [W:3.408 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site