X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Ftime.h;h=2091a19f1655aab8e5130256f83af4103efa9e3f;hb=90a1ba0c5e39eeea278f263c28ae02166c5911c8;hp=6a5f503b4f1d6a7fbed3175f88aa3110ff1e6ea6;hpb=a9417357cff6027f9d6b1740f821baa59f2381f4;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/time.h b/include/linux/time.h
index 6a5f503b4f1..2091a19f165 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -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);
@@ -120,8 +120,9 @@ extern void getboottime(struct timespec *ts);
 extern void monotonic_to_bootbased(struct timespec *ts);
 
 extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
-extern int timekeeping_is_continuous(void);
+extern int timekeeping_valid_for_hres(void);
 extern void update_wall_time(void);
+extern void update_xtime_cache(u64 nsec);
 
 /**
  * timespec_to_ns - Convert timespec to nanoseconds