lkml.org 
[lkml]   [2009]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:timers/core] timekeeping: Introduce timekeeping_leap_insert
    Commit-ID:  31089c13bcb18d2cd2a3ddfbe3a28666346f237e
    Gitweb: http://git.kernel.org/tip/31089c13bcb18d2cd2a3ddfbe3a28666346f237e
    Author: John Stultz <johnstul@us.ibm.com>
    AuthorDate: Fri, 14 Aug 2009 15:47:18 +0200
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Sat, 15 Aug 2009 10:55:45 +0200

    timekeeping: Introduce timekeeping_leap_insert

    Move the adjustment of xtime, wall_to_monotonic and the update of the
    vsyscall variables to the timekeeping code.

    Signed-off-by: John Stultz <johnstul@us.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    LKML-Reference: <20090814134807.609730216@de.ibm.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>


    ---
    include/linux/time.h | 1 +
    kernel/time/ntp.c | 7 ++-----
    kernel/time/timekeeping.c | 7 +++++++
    3 files changed, 10 insertions(+), 5 deletions(-)

    diff --git a/include/linux/time.h b/include/linux/time.h
    index ea16c1a..e7c8445 100644
    --- a/include/linux/time.h
    +++ b/include/linux/time.h
    @@ -147,6 +147,7 @@ extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
    extern int timekeeping_valid_for_hres(void);
    extern void update_wall_time(void);
    extern void update_xtime_cache(u64 nsec);
    +extern void timekeeping_leap_insert(int leapsecond);

    struct tms;
    extern void do_sys_times(struct tms *);
    diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
    index 7fc6437..4800f93 100644
    --- a/kernel/time/ntp.c
    +++ b/kernel/time/ntp.c
    @@ -194,8 +194,7 @@ static enum hrtimer_restart ntp_leap_second(struct hrtimer *timer)
    case TIME_OK:
    break;
    case TIME_INS:
    - xtime.tv_sec--;
    - wall_to_monotonic.tv_sec++;
    + timekeeping_leap_insert(-1);
    time_state = TIME_OOP;
    printk(KERN_NOTICE
    "Clock: inserting leap second 23:59:60 UTC\n");
    @@ -203,9 +202,8 @@ static enum hrtimer_restart ntp_leap_second(struct hrtimer *timer)
    res = HRTIMER_RESTART;
    break;
    case TIME_DEL:
    - xtime.tv_sec++;
    + timekeeping_leap_insert(1);
    time_tai--;
    - wall_to_monotonic.tv_sec--;
    time_state = TIME_WAIT;
    printk(KERN_NOTICE
    "Clock: deleting leap second 23:59:59 UTC\n");
    @@ -219,7 +217,6 @@ static enum hrtimer_restart ntp_leap_second(struct hrtimer *timer)
    time_state = TIME_OK;
    break;
    }
    - update_vsyscall(&xtime, clock);

    write_sequnlock(&xtime_lock);

    diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
    index 02c0b2c..b8b70fb 100644
    --- a/kernel/time/timekeeping.c
    +++ b/kernel/time/timekeeping.c
    @@ -58,6 +58,13 @@ void update_xtime_cache(u64 nsec)

    struct clocksource *clock;

    +/* must hold xtime_lock */
    +void timekeeping_leap_insert(int leapsecond)
    +{
    + xtime.tv_sec += leapsecond;
    + wall_to_monotonic.tv_sec -= leapsecond;
    + update_vsyscall(&xtime, clock);
    +}

    #ifdef CONFIG_GENERIC_TIME
    /**

    \
     
     \ /
      Last update: 2009-08-15 11:05    [W:0.026 / U:60.520 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site