Merge branch 'linux-2.6'

[linux.git] / include / linux / time.h

diff --git a/include/linux/time.h b/include/linux/time.h
index 55cee172d723914eed0770f178f95ae6bd7b122b..8ea8dea713c7c5d7a7da0fcd2e72d3d70f9112af 100644 (file)
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -90,8 +90,9 @@ static inline struct timespec timespec_sub(struct timespec lhs,
 
 extern struct timespec xtime;
 extern struct timespec wall_to_monotonic;
-extern seqlock_t xtime_lock;
+extern seqlock_t xtime_lock __attribute__((weak));
 
+extern unsigned long read_persistent_clock(void);
 void timekeeping_init(void);
 
 static inline unsigned long get_seconds(void)