sysctl: add proc_do_large_bitmap

[safe/jmp/linux-2.6] / kernel / time / ntp.c

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 4800f93..7c0f180 100644 (file)
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -58,10 +58,10 @@ static s64                  time_offset;
 static long                    time_constant = 2;
 
 /* maximum error (usecs):                                              */
-long                           time_maxerror = NTP_PHASE_LIMIT;
+static long                    time_maxerror = NTP_PHASE_LIMIT;
 
 /* estimated error (usecs):                                            */
-long                           time_esterror = NTP_PHASE_LIMIT;
+static long                    time_esterror = NTP_PHASE_LIMIT;
 
 /* frequency offset (scaled nsecs/secs):                               */
 static s64                     time_freq;
@@ -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;