瀏覽代碼

timekeeping: Make xtime and wall_to_monotonic static

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>
LKML-Reference: <1279068988-21864-10-git-send-email-johnstul@us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
John Stultz 15 年之前
父節點
當前提交
0fb86b0629
共有 3 個文件被更改,包括 2 次插入14 次删除
  1. 0 10
      Documentation/feature-removal-schedule.txt
  2. 0 2
      include/linux/time.h
  3. 2 2
      kernel/time/timekeeping.c

+ 0 - 10
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
 What:	KVM kernel-allocated memory slots
 When:	July 2010
 When:	July 2010
 Why:	Since 2.6.25, kvm supports user-allocated memory slots, which are
 Why:	Since 2.6.25, kvm supports user-allocated memory slots, which are

+ 0 - 2
include/linux/time.h

@@ -113,8 +113,6 @@ static inline struct timespec timespec_sub(struct timespec lhs,
 #define timespec_valid(ts) \
 #define timespec_valid(ts) \
 	(((ts)->tv_sec >= 0) && (((unsigned long) (ts)->tv_nsec) < NSEC_PER_SEC))
 	(((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 seqlock_t xtime_lock;
 
 
 extern void read_persistent_clock(struct timespec *ts);
 extern void read_persistent_clock(struct timespec *ts);

+ 2 - 2
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
  * - wall_to_monotonic is no longer the boot time, getboottime must be
  * used instead.
  * 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;
 static struct timespec total_sleep_time;
 
 
 /*
 /*