Merge branch 'linux-2.6'

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

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 14a2ecf2b318f82bd87d22031da05738e3773fd4..5fd9b946977038cbdc192dc5a11146696ad53947 100644 (file)
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -42,16 +42,13 @@ long time_esterror = NTP_PHASE_LIMIT;       /* estimated error (us)         */
 long time_freq;                                /* frequency offset (scaled ppm)*/
 static long time_reftime;              /* time at last adjustment (s)  */
 long time_adjust;
-
-#define CLOCK_TICK_OVERFLOW    (LATCH * HZ - CLOCK_TICK_RATE)
-#define CLOCK_TICK_ADJUST      (((s64)CLOCK_TICK_OVERFLOW * NSEC_PER_SEC) / \
-                                       (s64)CLOCK_TICK_RATE)
+static long ntp_tick_adj;
 
 static void ntp_update_frequency(void)
 {
        u64 second_length = (u64)(tick_usec * NSEC_PER_USEC * USER_HZ)
                                << TICK_LENGTH_SHIFT;
-       second_length += (s64)CLOCK_TICK_ADJUST << TICK_LENGTH_SHIFT;
+       second_length += (s64)ntp_tick_adj << TICK_LENGTH_SHIFT;
        second_length += (s64)time_freq << (TICK_LENGTH_SHIFT - SHIFT_NSEC);
 
        tick_length_base = second_length;
@@ -249,10 +246,12 @@ int do_adjtimex(struct timex *txc)
 
        /* Now we validate the data before disabling interrupts */
 
-       if ((txc->modes & ADJ_OFFSET_SINGLESHOT) == ADJ_OFFSET_SINGLESHOT)
+       if ((txc->modes & ADJ_OFFSET_SINGLESHOT) == ADJ_OFFSET_SINGLESHOT) {
          /* singleshot must not be used with any other mode bits */
-               if (txc->modes != ADJ_OFFSET_SINGLESHOT)
+               if (txc->modes != ADJ_OFFSET_SINGLESHOT &&
+                                       txc->modes != ADJ_OFFSET_SS_READ)
                        return -EINVAL;
+       }
 
        if (txc->modes != ADJ_OFFSET_SINGLESHOT && (txc->modes & ADJ_OFFSET))
          /* adjustment Offset limited to +- .512 seconds */
@@ -344,14 +343,16 @@ int do_adjtimex(struct timex *txc)
                    freq_adj = shift_right(freq_adj, time_constant * 2 +
                                           (SHIFT_PLL + 2) * 2 - SHIFT_NSEC);
                    if (mtemp >= MINSEC && (time_status & STA_FLL || mtemp > MAXSEC)) {
+                       u64 utemp64;
                        temp64 = time_offset << (SHIFT_NSEC - SHIFT_FLL);
                        if (time_offset < 0) {
-                           temp64 = -temp64;
-                           do_div(temp64, mtemp);
-                           freq_adj -= temp64;
+                           utemp64 = -temp64;
+                           do_div(utemp64, mtemp);
+                           freq_adj -= utemp64;
                        } else {
-                           do_div(temp64, mtemp);
-                           freq_adj += temp64;
+                           utemp64 = temp64;
+                           do_div(utemp64, mtemp);
+                           freq_adj += utemp64;
                        }
                    }
                    freq_adj += time_freq;
@@ -372,7 +373,8 @@ int do_adjtimex(struct timex *txc)
 leave: if ((time_status & (STA_UNSYNC|STA_CLOCKERR)) != 0)
                result = TIME_ERROR;
 
-       if ((txc->modes & ADJ_OFFSET_SINGLESHOT) == ADJ_OFFSET_SINGLESHOT)
+       if ((txc->modes == ADJ_OFFSET_SINGLESHOT) ||
+                       (txc->modes == ADJ_OFFSET_SS_READ))
                txc->offset = save_adjust;
        else
                txc->offset = ((long)shift_right(time_offset, SHIFT_UPDATE)) *
@@ -401,3 +403,11 @@ leave:     if ((time_status & (STA_UNSYNC|STA_CLOCKERR)) != 0)
        notify_cmos_timer();
        return(result);
 }
+
+static int __init ntp_tick_adj_setup(char *str)
+{
+       ntp_tick_adj = simple_strtol(str, NULL, 0);
+       return 1;
+}
+
+__setup("ntp_tick_adj=", ntp_tick_adj_setup);