vserver 2.0 rc7

[linux-2.6.git] / kernel / time.c

diff --git a/kernel/time.c b/kernel/time.c
index d5400f6..d4335c1 100644 (file)
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -34,6 +34,7 @@
 #include <linux/syscalls.h>
 #include <linux/security.h>
 #include <linux/fs.h>
+#include <linux/module.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -215,6 +216,14 @@ long pps_stbcnt;           /* stability limit exceeded */
 /* hook for a loadable hardpps kernel module */
 void (*hardpps_ptr)(struct timeval *);
 
+/* we call this to notify the arch when the clock is being
+ * controlled.  If no such arch routine, do nothing.
+ */
+void __attribute__ ((weak)) notify_arch_cmos_timer(void)
+{
+       return;
+}
+
 /* adjtimex mainly allows reading (and writing, if superuser) of
  * kernel time-keeping variables. used by xntpd.
  */
@@ -398,6 +407,7 @@ leave:      if ((time_status & (STA_UNSYNC|STA_CLOCKERR)) != 0
        txc->stbcnt        = pps_stbcnt;
        write_sequnlock_irq(&xtime_lock);
        do_gettimeofday(&txc->time);
+       notify_arch_cmos_timer();
        return(result);
 }
 
@@ -494,6 +504,7 @@ void getnstimeofday (struct timespec *tv)
        tv->tv_sec = sec;
        tv->tv_nsec = nsec;
 }
+EXPORT_SYMBOL_GPL(getnstimeofday);
 
 int do_settimeofday (struct timespec *tv)
 {
@@ -505,14 +516,6 @@ int do_settimeofday (struct timespec *tv)
 
        write_seqlock_irq(&xtime_lock);
        {
-               /*
-                * This is revolting. We need to set "xtime" correctly. However, the value
-                * in this location is the value at the most recent update of wall time.
-                * Discover what correction gettimeofday would have done, and then undo
-                * it!
-                */
-               nsec -= time_interpolator_get_offset();
-
                wtm_sec  = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
                wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);