lkml.org 
[lkml]   [2014]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 19/55] timekeeping: Use ktime_t based data for ktime_get_clocktai()
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    include/linux/timekeeping.h | 9 ++++++++-
    kernel/time/timekeeping.c | 15 ---------------
    2 files changed, 8 insertions(+), 16 deletions(-)

    Index: tip/include/linux/timekeeping.h
    ===================================================================
    --- tip.orig/include/linux/timekeeping.h
    +++ tip/include/linux/timekeeping.h
    @@ -109,7 +109,6 @@ enum tk_offsets {
    extern ktime_t ktime_get(void);
    extern ktime_t ktime_get_with_offset(enum tk_offsets offs);
    extern ktime_t ktime_get_monotonic_offset(void);
    -extern ktime_t ktime_get_clocktai(void);

    /**
    * ktime_get_real - get the real (wall-) time in ktime_t format
    @@ -130,6 +129,14 @@ static inline ktime_t ktime_get_boottime
    return ktime_get_with_offset(TK_OFFS_BOOT);
    }

    +/**
    + * ktime_get_clocktai - Returns the TAI time of day in ktime_t format
    + */
    +static inline ktime_t ktime_get_clocktai(void)
    +{
    + return ktime_get_with_offset(TK_OFFS_TAI);
    +}
    +
    /*
    * RTC specific
    */
    Index: tip/kernel/time/timekeeping.c
    ===================================================================
    --- tip.orig/kernel/time/timekeeping.c
    +++ tip/kernel/time/timekeeping.c
    @@ -511,21 +511,6 @@ void timekeeping_clocktai(struct timespe
    }
    EXPORT_SYMBOL(timekeeping_clocktai);

    -
    -/**
    - * ktime_get_clocktai - Returns the TAI time of day in a ktime
    - *
    - * Returns the time of day in a ktime.
    - */
    -ktime_t ktime_get_clocktai(void)
    -{
    - struct timespec ts;
    -
    - timekeeping_clocktai(&ts);
    - return timespec_to_ktime(ts);
    -}
    -EXPORT_SYMBOL(ktime_get_clocktai);
    -
    #ifdef CONFIG_NTP_PPS

    /**



    \
     
     \ /
      Last update: 2014-07-11 16:41    [W:5.398 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site