Fix arch headers.
[linux-flexiantxendom0-3.2.10.git] / kernel / time.c
index 3af9c7d..e78e500 100644 (file)
@@ -35,7 +35,7 @@
  */
 struct timezone sys_tz;
 
-extern unsigned long last_time_offset;
+extern unsigned long last_nsec_offset;
 
 #if !defined(__alpha__) && !defined(__ia64__)
 
@@ -79,7 +79,7 @@ asmlinkage long sys_stime(int * tptr)
        write_seqlock_irq(&xtime_lock);
        xtime.tv_sec = value;
        xtime.tv_nsec = 0;
-       last_time_offset = 0;
+       last_nsec_offset = 0;
        time_adjust = 0;        /* stop active adjtime() */
        time_status |= STA_UNSYNC;
        time_maxerror = NTP_PHASE_LIMIT;
@@ -125,7 +125,7 @@ inline static void warp_clock(void)
 {
        write_seqlock_irq(&xtime_lock);
        xtime.tv_sec += sys_tz.tz_minuteswest * 60;
-       last_time_offset = 0;
+       last_nsec_offset = 0;
        write_sequnlock_irq(&xtime_lock);
 }
 
@@ -381,7 +381,7 @@ leave:      if ((time_status & (STA_UNSYNC|STA_CLOCKERR)) != 0
        txc->calcnt        = pps_calcnt;
        txc->errcnt        = pps_errcnt;
        txc->stbcnt        = pps_stbcnt;
-       last_time_offset = 0;
+       last_nsec_offset = 0;
        write_sequnlock_irq(&xtime_lock);
        do_gettimeofday(&txc->time);
        return(result);