lkml.org 
[lkml]   [2014]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch V2 05/64] ktime: Sanitize ktime_to_us/ms conversion
    With the plain nanoseconds based ktime_t we can simply use
    ktime_divns() instead of going through loops and hoops of
    timespec/timeval conversion.

    Reported-by: John Stultz <john.stultz@linaro.org>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    include/linux/hrtimer.h | 6 ------
    include/linux/ktime.h | 12 ++++++++----
    kernel/time/hrtimer.c | 1 +
    3 files changed, 9 insertions(+), 10 deletions(-)

    Index: tip/include/linux/hrtimer.h
    ===================================================================
    --- tip.orig/include/linux/hrtimer.h
    +++ tip/include/linux/hrtimer.h
    @@ -457,12 +457,6 @@ extern void hrtimer_run_pending(void);
    /* Bootup initialization: */
    extern void __init hrtimers_init(void);

    -#if BITS_PER_LONG < 64
    -extern u64 ktime_divns(const ktime_t kt, s64 div);
    -#else /* BITS_PER_LONG < 64 */
    -# define ktime_divns(kt, div) (u64)((kt).tv64 / (div))
    -#endif
    -
    /* Show pending timers: */
    extern void sysrq_timer_list_show(void);

    Index: tip/include/linux/ktime.h
    ===================================================================
    --- tip.orig/include/linux/ktime.h
    +++ tip/include/linux/ktime.h
    @@ -157,16 +157,20 @@ static inline bool ktime_before(const kt
    return ktime_compare(cmp1, cmp2) < 0;
    }

    +#if BITS_PER_LONG < 64
    +extern u64 ktime_divns(const ktime_t kt, s64 div);
    +#else /* BITS_PER_LONG < 64 */
    +# define ktime_divns(kt, div) (u64)((kt).tv64 / (div))
    +#endif
    +
    static inline s64 ktime_to_us(const ktime_t kt)
    {
    - struct timeval tv = ktime_to_timeval(kt);
    - return (s64) tv.tv_sec * USEC_PER_SEC + tv.tv_usec;
    + return ktime_divns(kt, NSEC_PER_USEC);
    }

    static inline s64 ktime_to_ms(const ktime_t kt)
    {
    - struct timeval tv = ktime_to_timeval(kt);
    - return (s64) tv.tv_sec * MSEC_PER_SEC + tv.tv_usec / USEC_PER_MSEC;
    + return ktime_divns(kt, NSEC_PER_MSEC);
    }

    static inline s64 ktime_us_delta(const ktime_t later, const ktime_t earlier)
    Index: tip/kernel/time/hrtimer.c
    ===================================================================
    --- tip.orig/kernel/time/hrtimer.c
    +++ tip/kernel/time/hrtimer.c
    @@ -280,6 +280,7 @@ u64 ktime_divns(const ktime_t kt, s64 di

    return dclc;
    }
    +EXPORT_SYMBOL_GPL(ktime_divns);
    #endif /* BITS_PER_LONG >= 64 */

    /*



    \
     
     \ /
      Last update: 2014-07-17 02:21    [W:4.198 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site