kernel/time/timekeeping.c: cleanups

PATCH New Adrian Bunk 1 participant 1 message Aug 14, 2007 Timekeeping, clocksource core, NTP, alarmtimer

Share & tools

Adrian Bunk

author

2007-08-14 21:34 UTC #0 lore raw

PATCH 1/1 kernel/time/timekeeping.c: cleanups

This patch contains the following cleanups:
- remove the no longer required __attribute__((weak)) of xtime_lock
- remove the following no longer used EXPORT_SYMBOL's:
- xtime
- xtime_lock

Signed-off-by Adrian Bunk <[email protected]>

---

IMHO a 2.6.23 patch since it catches drivers still using xtime.

 include/linux/time.h      |    2 +-
 kernel/time/timekeeping.c |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

3fd949c027b3537f3a70fff2a0a9fca5049dd014

kernel/time/timekeeping.c +1 -4

index acc417b..8c0596e 100644
@@ -24,9 +24,7 @@
  * This read-write spinlock protects us from races in SMP while
  * playing with xtime and avenrun.
  */
-__attribute__((weak)) __cacheline_aligned_in_smp DEFINE_SEQLOCK(xtime_lock);
-
-EXPORT_SYMBOL(xtime_lock);
+__cacheline_aligned_in_smp DEFINE_SEQLOCK(xtime_lock);
 
 
 /*

@@ -47,7 +45,6 @@ EXPORT_SYMBOL(xtime_lock);
 struct timespec xtime __attribute__ ((aligned (16)));
 struct timespec wall_to_monotonic __attribute__ ((aligned (16)));
 static unsigned long total_sleep_time;		/* seconds */
-EXPORT_SYMBOL(xtime);
 
 
 #ifdef CONFIG_NO_HZ

include/linux/time.h +1 -1

index 6a5f503..b04136d 100644
@@ -92,7 +92,7 @@ static inline struct timespec timespec_sub(struct timespec lhs,
 
 extern struct timespec xtime;
 extern struct timespec wall_to_monotonic;
-extern seqlock_t xtime_lock __attribute__((weak));
+extern seqlock_t xtime_lock;
 
 extern unsigned long read_persistent_clock(void);
 extern int update_persistent_clock(struct timespec now);