ntp: Cleanup xtime references in ntp.c
John Stultz [Fri, 29 Jan 2010 04:20:44 +0000 (20:20 -0800)]
ntp.c doesn't need to access timekeeping internals directly, so change
xtime references to use the get_seconds() timekeeping interface.

Signed-off-by: John Stultz <johnstul@us.ibm.com>
Cc: richard@rsk.demon.co.uk
LKML-Reference: <1264738844-21935-1-git-send-email-johnstul@us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

kernel/time/ntp.c

index 74b1b37..7c0f180 100644 (file)
@@ -142,11 +142,11 @@ static void ntp_update_offset(long offset)
         * Select how the frequency is to be controlled
         * and in which mode (PLL or FLL).
         */
-       secs = xtime.tv_sec - time_reftime;
+       secs = get_seconds() - time_reftime;
        if (unlikely(time_status & STA_FREQHOLD))
                secs = 0;
 
-       time_reftime = xtime.tv_sec;
+       time_reftime = get_seconds();
 
        offset64    = offset;
        freq_adj    = (offset64 * secs) <<
@@ -368,7 +368,7 @@ static inline void process_adj_status(struct timex *txc, struct timespec *ts)
         * reference time to current time.
         */
        if (!(time_status & STA_PLL) && (txc->status & STA_PLL))
-               time_reftime = xtime.tv_sec;
+               time_reftime = get_seconds();
 
        /* only set allowed bits */
        time_status &= STA_RONLY;