lkml.org 
[lkml]   [2017]   [Jan]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH RESEND 09/36] alpha: Convert obsolete cputime_t to nsecs
    Date
    Use the new nsec based cputime accessors as part of the whole cputime
    conversion from cputime_t to nsecs.

    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Michael Ellerman <mpe@ellerman.id.au>
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Cc: Tony Luck <tony.luck@intel.com>
    Cc: Fenghua Yu <fenghua.yu@intel.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Rik van Riel <riel@redhat.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Stanislaw Gruszka <sgruszka@redhat.com>
    Cc: Wanpeng Li <wanpeng.li@hotmail.com>
    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    ---
    arch/alpha/kernel/osf_sys.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
    index 82ccb43..9d27a7d 100644
    --- a/arch/alpha/kernel/osf_sys.c
    +++ b/arch/alpha/kernel/osf_sys.c
    @@ -1145,7 +1145,7 @@ struct rusage32 {
    SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru)
    {
    struct rusage32 r;
    - cputime_t utime, stime;
    + u64 utime, stime;
    unsigned long utime_jiffies, stime_jiffies;

    if (who != RUSAGE_SELF && who != RUSAGE_CHILDREN)
    @@ -1154,9 +1154,9 @@ SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru)
    memset(&r, 0, sizeof(r));
    switch (who) {
    case RUSAGE_SELF:
    - task_cputime_t(current, &utime, &stime);
    - utime_jiffies = cputime_to_jiffies(utime);
    - stime_jiffies = cputime_to_jiffies(stime);
    + task_cputime(current, &utime, &stime);
    + utime_jiffies = nsecs_to_jiffies(utime);
    + stime_jiffies = nsecs_to_jiffies(stime);
    jiffies_to_timeval32(utime_jiffies, &r.ru_utime);
    jiffies_to_timeval32(stime_jiffies, &r.ru_stime);
    r.ru_minflt = current->min_flt;
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-01-31 04:20    [W:2.523 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site