lkml.org 
[lkml]   [2011]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/16] time: Move raw_time into timekeeper structure
    Date
    In preparation for locking cleanups, move raw_time into
    timekeeper structure.

    CC: Thomas Gleixner <tglx@linutronix.de>
    CC: Eric Dumazet <eric.dumazet@gmail.com>
    CC: Richard Cochran <richardcochran@gmail.com>
    Signed-off-by: John Stultz <john.stultz@linaro.org>
    ---
    kernel/time/timekeeping.c | 23 ++++++++++-------------
    1 files changed, 10 insertions(+), 13 deletions(-)

    diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
    index 6c64931..19d160a 100644
    --- a/kernel/time/timekeeping.c
    +++ b/kernel/time/timekeeping.c
    @@ -67,7 +67,8 @@ struct timekeeper {
    struct timespec wall_to_monotonic;
    /* time spent in suspend */
    struct timespec total_sleep_time;
    -
    + /* The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock. */
    + struct timespec raw_time;
    };

    static struct timekeeper timekeeper;
    @@ -164,10 +165,6 @@ __cacheline_aligned_in_smp DEFINE_SEQLOCK(xtime_lock);



    -/*
    - * The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock.
    - */
    -static struct timespec raw_time;

    /* flag for if timekeeping is suspended */
    int __read_mostly timekeeping_suspended;
    @@ -208,7 +205,7 @@ static void timekeeping_forward_now(void)
    timespec_add_ns(&timekeeper.xtime, nsec);

    nsec = clocksource_cyc2ns(cycle_delta, clock->mult, clock->shift);
    - timespec_add_ns(&raw_time, nsec);
    + timespec_add_ns(&timekeeper.raw_time, nsec);
    }

    /**
    @@ -316,7 +313,7 @@ void getnstime_raw_and_real(struct timespec *ts_raw, struct timespec *ts_real)

    seq = read_seqbegin(&xtime_lock);

    - *ts_raw = raw_time;
    + *ts_raw = timekeeper.raw_time;
    *ts_real = timekeeper.xtime;

    nsecs_raw = timekeeping_get_ns_raw();
    @@ -495,7 +492,7 @@ void getrawmonotonic(struct timespec *ts)
    do {
    seq = read_seqbegin(&xtime_lock);
    nsecs = timekeeping_get_ns_raw();
    - *ts = raw_time;
    + *ts = timekeeper.raw_time;

    } while (read_seqretry(&xtime_lock, seq));

    @@ -586,8 +583,8 @@ void __init timekeeping_init(void)

    timekeeper.xtime.tv_sec = now.tv_sec;
    timekeeper.xtime.tv_nsec = now.tv_nsec;
    - raw_time.tv_sec = 0;
    - raw_time.tv_nsec = 0;
    + timekeeper.raw_time.tv_sec = 0;
    + timekeeper.raw_time.tv_nsec = 0;
    if (boot.tv_sec == 0 && boot.tv_nsec == 0) {
    boot.tv_sec = timekeeper.xtime.tv_sec;
    boot.tv_nsec = timekeeper.xtime.tv_nsec;
    @@ -868,13 +865,13 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift)

    /* Accumulate raw time */
    raw_nsecs = timekeeper.raw_interval << shift;
    - raw_nsecs += raw_time.tv_nsec;
    + raw_nsecs += timekeeper.raw_time.tv_nsec;
    if (raw_nsecs >= NSEC_PER_SEC) {
    u64 raw_secs = raw_nsecs;
    raw_nsecs = do_div(raw_secs, NSEC_PER_SEC);
    - raw_time.tv_sec += raw_secs;
    + timekeeper.raw_time.tv_sec += raw_secs;
    }
    - raw_time.tv_nsec = raw_nsecs;
    + timekeeper.raw_time.tv_nsec = raw_nsecs;

    /* Accumulate error between NTP and clock interval */
    timekeeper.ntp_error += tick_length << shift;
    --
    1.7.3.2.146.gca209


    \
     
     \ /
      Last update: 2011-11-15 05:11    [W:3.994 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site