Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0fb86b06298b6cd3205cac2e68a499f269282dac

Authored by John Stultz
Committed by Thomas Gleixner
1 parent 8ab4351a4c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 3 changed files with 2 additions and 14 deletions Side-by-side Diff

Documentation/feature-removal-schedule.txt
Diff comments   View file @ 0fb86b0
... ... @@ -549,16 +549,6 @@
549 549  
550 550 ----------------------------
551 551  
552   -What: xtime, wall_to_monotonic
553   -When: 2.6.36+
554   -Files: kernel/time/timekeeping.c include/linux/time.h
555   -Why: Cleaning up timekeeping internal values. Please use
556   - existing timekeeping accessor functions to access
557   - the equivalent functionality.
558   -Who: John Stultz <johnstul@us.ibm.com>
559   -
560   -----------------------------
561   -
562 552 What: KVM kernel-allocated memory slots
563 553 When: July 2010
564 554 Why: Since 2.6.25, kvm supports user-allocated memory slots, which are
include/linux/time.h
Diff comments   View file @ 0fb86b0
... ... @@ -113,8 +113,6 @@
113 113 #define timespec_valid(ts) \
114 114 (((ts)->tv_sec >= 0) && (((unsigned long) (ts)->tv_nsec) < NSEC_PER_SEC))
115 115  
116   -extern struct timespec xtime;
117   -extern struct timespec wall_to_monotonic;
118 116 extern seqlock_t xtime_lock;
119 117  
120 118 extern void read_persistent_clock(struct timespec *ts);
kernel/time/timekeeping.c
Diff comments   View file @ 0fb86b0
... ... @@ -153,8 +153,8 @@
153 153 * - wall_to_monotonic is no longer the boot time, getboottime must be
154 154 * used instead.
155 155 */
156   -struct timespec xtime __attribute__ ((aligned (16)));
157   -struct timespec wall_to_monotonic __attribute__ ((aligned (16)));
  156 +static struct timespec xtime __attribute__ ((aligned (16)));
  157 +static struct timespec wall_to_monotonic __attribute__ ((aligned (16)));
158 158 static struct timespec total_sleep_time;
159 159  
160 160 /*