lkml.org 
[lkml]   [2009]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC][patch 01/12] introduce timekeeping_leap_insert
    From: john stultz <johnstul@us.ibm.com>

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

    Index: linux-2.6/include/linux/time.h
    ===================================================================
    --- linux-2.6.orig/include/linux/time.h
    +++ linux-2.6/include/linux/time.h
    @@ -147,6 +147,7 @@ extern struct timespec timespec_trunc(st
    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 *);
    Index: linux-2.6/kernel/time/ntp.c
    ===================================================================
    --- linux-2.6.orig/kernel/time/ntp.c
    +++ linux-2.6/kernel/time/ntp.c
    @@ -194,8 +194,7 @@ static enum hrtimer_restart ntp_leap_sec
    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_sec
    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_sec
    time_state = TIME_OK;
    break;
    }
    - update_vsyscall(&xtime, clock);

    write_sequnlock(&xtime_lock);

    Index: linux-2.6/kernel/time/timekeeping.c
    ===================================================================
    --- linux-2.6.orig/kernel/time/timekeeping.c
    +++ linux-2.6/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
    /**
    --
    blue skies,
    Martin.

    "Reality continues to ruin my life." - Calvin.



    \
     
     \ /
      Last update: 2009-07-29 15:45    [W:3.399 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site