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 29/36] ia64: Move nsecs based cputime headers to the last arch using it
    Date
    Initially, nsec based cputime_t implementation belonged to ia64. It got
    exported later for CONFIG_VIRT_CPU_ACCOUNTING_GEN but now it is again
    only used by ia64. So let's move it back there.

    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/ia64/include/asm/cputime.h | 108 +++++++++++++++++++++++++++++++-
    include/asm-generic/cputime.h | 4 --
    include/asm-generic/cputime_nsecs.h | 121 ------------------------------------
    3 files changed, 106 insertions(+), 127 deletions(-)
    delete mode 100644 include/asm-generic/cputime_nsecs.h

    diff --git a/arch/ia64/include/asm/cputime.h b/arch/ia64/include/asm/cputime.h
    index e2d3f5b..fee773c 100644
    --- a/arch/ia64/include/asm/cputime.h
    +++ b/arch/ia64/include/asm/cputime.h
    @@ -20,9 +20,113 @@

    #ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
    # include <asm-generic/cputime.h>
    +
    #else
    -# include <asm/processor.h>
    -# include <asm-generic/cputime_nsecs.h>
    +
    +#include <asm/processor.h>
    +#include <linux/math64.h>
    +
    +typedef u64 __nocast cputime_t;
    +typedef u64 __nocast cputime64_t;
    +
    +#define cmpxchg_cputime(ptr, old, new) cmpxchg64(ptr, old, new)
    +
    +#define cputime_one_jiffy jiffies_to_cputime(1)
    +
    +#define cputime_div(__ct, divisor) div_u64((__force u64)__ct, divisor)
    +#define cputime_div_rem(__ct, divisor, remainder) \
    + div_u64_rem((__force u64)__ct, divisor, remainder);
    +
    +/*
    + * Convert cputime <-> jiffies (HZ)
    + */
    +#define cputime_to_jiffies(__ct) \
    + cputime_div(__ct, NSEC_PER_SEC / HZ)
    +#define jiffies_to_cputime(__jif) \
    + (__force cputime_t)((__jif) * (NSEC_PER_SEC / HZ))
    +#define cputime64_to_jiffies64(__ct) \
    + cputime_div(__ct, NSEC_PER_SEC / HZ)
    +#define jiffies64_to_cputime64(__jif) \
    + (__force cputime64_t)((__jif) * (NSEC_PER_SEC / HZ))
    +
    +
    +/*
    + * Convert cputime <-> nanoseconds
    + */
    +#define cputime_to_nsecs(__ct) \
    + (__force u64)(__ct)
    +#define nsecs_to_cputime(__nsecs) \
    + (__force cputime_t)(__nsecs)
    +#define nsecs_to_cputime64(__nsecs) \
    + (__force cputime64_t)(__nsecs)
    +
    +
    +/*
    + * Convert cputime <-> microseconds
    + */
    +#define cputime_to_usecs(__ct) \
    + cputime_div(__ct, NSEC_PER_USEC)
    +#define usecs_to_cputime(__usecs) \
    + (__force cputime_t)((__usecs) * NSEC_PER_USEC)
    +#define usecs_to_cputime64(__usecs) \
    + (__force cputime64_t)((__usecs) * NSEC_PER_USEC)
    +
    +/*
    + * Convert cputime <-> seconds
    + */
    +#define cputime_to_secs(__ct) \
    + cputime_div(__ct, NSEC_PER_SEC)
    +#define secs_to_cputime(__secs) \
    + (__force cputime_t)((__secs) * NSEC_PER_SEC)
    +
    +/*
    + * Convert cputime <-> timespec (nsec)
    + */
    +static inline cputime_t timespec_to_cputime(const struct timespec *val)
    +{
    + u64 ret = (u64)val->tv_sec * NSEC_PER_SEC + val->tv_nsec;
    + return (__force cputime_t) ret;
    +}
    +static inline void cputime_to_timespec(const cputime_t ct, struct timespec *val)
    +{
    + u32 rem;
    +
    + val->tv_sec = cputime_div_rem(ct, NSEC_PER_SEC, &rem);
    + val->tv_nsec = rem;
    +}
    +
    +/*
    + * Convert cputime <-> timeval (msec)
    + */
    +static inline cputime_t timeval_to_cputime(const struct timeval *val)
    +{
    + u64 ret = (u64)val->tv_sec * NSEC_PER_SEC +
    + val->tv_usec * NSEC_PER_USEC;
    + return (__force cputime_t) ret;
    +}
    +static inline void cputime_to_timeval(const cputime_t ct, struct timeval *val)
    +{
    + u32 rem;
    +
    + val->tv_sec = cputime_div_rem(ct, NSEC_PER_SEC, &rem);
    + val->tv_usec = rem / NSEC_PER_USEC;
    +}
    +
    +/*
    + * Convert cputime <-> clock (USER_HZ)
    + */
    +#define cputime_to_clock_t(__ct) \
    + cputime_div(__ct, (NSEC_PER_SEC / USER_HZ))
    +#define clock_t_to_cputime(__x) \
    + (__force cputime_t)((__x) * (NSEC_PER_SEC / USER_HZ))
    +
    +/*
    + * Convert cputime64 to clock.
    + */
    +#define cputime64_to_clock_t(__ct) \
    + cputime_to_clock_t((__force cputime_t)__ct)
    +
    +
    extern void arch_vtime_task_switch(struct task_struct *tsk);
    #endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */

    diff --git a/include/asm-generic/cputime.h b/include/asm-generic/cputime.h
    index 8a624b4..358e547 100644
    --- a/include/asm-generic/cputime.h
    +++ b/include/asm-generic/cputime.h
    @@ -4,8 +4,4 @@
    #include <linux/time.h>
    #include <linux/jiffies.h>

    -#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
    -# include <asm-generic/cputime_nsecs.h>
    -#endif
    -
    #endif
    diff --git a/include/asm-generic/cputime_nsecs.h b/include/asm-generic/cputime_nsecs.h
    deleted file mode 100644
    index 4e3b18e..0000000
    --- a/include/asm-generic/cputime_nsecs.h
    +++ /dev/null
    @@ -1,121 +0,0 @@
    -/*
    - * Definitions for measuring cputime in nsecs resolution.
    - *
    - * Based on <arch/ia64/include/asm/cputime.h>
    - *
    - * Copyright (C) 2007 FUJITSU LIMITED
    - * Copyright (C) 2007 Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
    - *
    - * This program is free software; you can redistribute it and/or
    - * modify it under the terms of the GNU General Public License
    - * as published by the Free Software Foundation; either version
    - * 2 of the License, or (at your option) any later version.
    - *
    - */
    -
    -#ifndef _ASM_GENERIC_CPUTIME_NSECS_H
    -#define _ASM_GENERIC_CPUTIME_NSECS_H
    -
    -#include <linux/math64.h>
    -
    -typedef u64 __nocast cputime_t;
    -typedef u64 __nocast cputime64_t;
    -
    -#define cmpxchg_cputime(ptr, old, new) cmpxchg64(ptr, old, new)
    -
    -#define cputime_one_jiffy jiffies_to_cputime(1)
    -
    -#define cputime_div(__ct, divisor) div_u64((__force u64)__ct, divisor)
    -#define cputime_div_rem(__ct, divisor, remainder) \
    - div_u64_rem((__force u64)__ct, divisor, remainder);
    -
    -/*
    - * Convert cputime <-> jiffies (HZ)
    - */
    -#define cputime_to_jiffies(__ct) \
    - cputime_div(__ct, NSEC_PER_SEC / HZ)
    -#define jiffies_to_cputime(__jif) \
    - (__force cputime_t)((__jif) * (NSEC_PER_SEC / HZ))
    -#define cputime64_to_jiffies64(__ct) \
    - cputime_div(__ct, NSEC_PER_SEC / HZ)
    -#define jiffies64_to_cputime64(__jif) \
    - (__force cputime64_t)((__jif) * (NSEC_PER_SEC / HZ))
    -
    -
    -/*
    - * Convert cputime <-> nanoseconds
    - */
    -#define cputime_to_nsecs(__ct) \
    - (__force u64)(__ct)
    -#define nsecs_to_cputime(__nsecs) \
    - (__force cputime_t)(__nsecs)
    -#define nsecs_to_cputime64(__nsecs) \
    - (__force cputime64_t)(__nsecs)
    -
    -
    -/*
    - * Convert cputime <-> microseconds
    - */
    -#define cputime_to_usecs(__ct) \
    - cputime_div(__ct, NSEC_PER_USEC)
    -#define usecs_to_cputime(__usecs) \
    - (__force cputime_t)((__usecs) * NSEC_PER_USEC)
    -#define usecs_to_cputime64(__usecs) \
    - (__force cputime64_t)((__usecs) * NSEC_PER_USEC)
    -
    -/*
    - * Convert cputime <-> seconds
    - */
    -#define cputime_to_secs(__ct) \
    - cputime_div(__ct, NSEC_PER_SEC)
    -#define secs_to_cputime(__secs) \
    - (__force cputime_t)((__secs) * NSEC_PER_SEC)
    -
    -/*
    - * Convert cputime <-> timespec (nsec)
    - */
    -static inline cputime_t timespec_to_cputime(const struct timespec *val)
    -{
    - u64 ret = (u64)val->tv_sec * NSEC_PER_SEC + val->tv_nsec;
    - return (__force cputime_t) ret;
    -}
    -static inline void cputime_to_timespec(const cputime_t ct, struct timespec *val)
    -{
    - u32 rem;
    -
    - val->tv_sec = cputime_div_rem(ct, NSEC_PER_SEC, &rem);
    - val->tv_nsec = rem;
    -}
    -
    -/*
    - * Convert cputime <-> timeval (msec)
    - */
    -static inline cputime_t timeval_to_cputime(const struct timeval *val)
    -{
    - u64 ret = (u64)val->tv_sec * NSEC_PER_SEC +
    - val->tv_usec * NSEC_PER_USEC;
    - return (__force cputime_t) ret;
    -}
    -static inline void cputime_to_timeval(const cputime_t ct, struct timeval *val)
    -{
    - u32 rem;
    -
    - val->tv_sec = cputime_div_rem(ct, NSEC_PER_SEC, &rem);
    - val->tv_usec = rem / NSEC_PER_USEC;
    -}
    -
    -/*
    - * Convert cputime <-> clock (USER_HZ)
    - */
    -#define cputime_to_clock_t(__ct) \
    - cputime_div(__ct, (NSEC_PER_SEC / USER_HZ))
    -#define clock_t_to_cputime(__x) \
    - (__force cputime_t)((__x) * (NSEC_PER_SEC / USER_HZ))
    -
    -/*
    - * Convert cputime64 to clock.
    - */
    -#define cputime64_to_clock_t(__ct) \
    - cputime_to_clock_t((__force cputime_t)__ct)
    -
    -#endif
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-01-31 04:20    [W:5.164 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site