lkml.org 
[lkml]   [2010]   [Jul]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/11] Make xtime and wall_to_monotonic static
    Date
    This patch makes xtime and wall_to_monotonic static, as planned in
    Documentation/feature-removal-schedule.txt. This will allow for
    further cleanups to the timekeeping core.

    Signed-off-by: John Stultz <johnstul@us.ibm.com>
    CC: Thomas Gleixner <tglx@linutronix.de>

    ---
    Documentation/feature-removal-schedule.txt | 10 ----------
    include/linux/time.h | 2 --
    kernel/time/timekeeping.c | 4 ++--
    3 files changed, 2 insertions(+), 14 deletions(-)

    diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
    index c268783..0d91c6b 100644
    --- a/Documentation/feature-removal-schedule.txt
    +++ b/Documentation/feature-removal-schedule.txt
    @@ -549,16 +549,6 @@ Who: Avi Kivity <avi@redhat.com>

    ----------------------------

    -What: xtime, wall_to_monotonic
    -When: 2.6.36+
    -Files: kernel/time/timekeeping.c include/linux/time.h
    -Why: Cleaning up timekeeping internal values. Please use
    - existing timekeeping accessor functions to access
    - the equivalent functionality.
    -Who: John Stultz <johnstul@us.ibm.com>
    -
    -----------------------------
    -
    What: KVM kernel-allocated memory slots
    When: July 2010
    Why: Since 2.6.25, kvm supports user-allocated memory slots, which are
    diff --git a/include/linux/time.h b/include/linux/time.h
    index 3a9c0bf..50b3cb0 100644
    --- a/include/linux/time.h
    +++ b/include/linux/time.h
    @@ -113,8 +113,6 @@ static inline struct timespec timespec_sub(struct timespec lhs,
    #define timespec_valid(ts) \
    (((ts)->tv_sec >= 0) && (((unsigned long) (ts)->tv_nsec) < NSEC_PER_SEC))

    -extern struct timespec xtime;
    -extern struct timespec wall_to_monotonic;
    extern seqlock_t xtime_lock;

    extern void read_persistent_clock(struct timespec *ts);
    diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
    index fb61c2e..e14c839 100644
    --- a/kernel/time/timekeeping.c
    +++ b/kernel/time/timekeeping.c
    @@ -153,8 +153,8 @@ __cacheline_aligned_in_smp DEFINE_SEQLOCK(xtime_lock);
    * - wall_to_monotonic is no longer the boot time, getboottime must be
    * used instead.
    */
    -struct timespec xtime __attribute__ ((aligned (16)));
    -struct timespec wall_to_monotonic __attribute__ ((aligned (16)));
    +static struct timespec xtime __attribute__ ((aligned (16)));
    +static struct timespec wall_to_monotonic __attribute__ ((aligned (16)));
    static struct timespec total_sleep_time;

    /*
    --
    1.6.0.4


    \
     
     \ /
      Last update: 2010-07-14 02:59    [W:0.036 / U:29.612 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site