Revert "ntp: Cleanup timex.h"

This reverts commit 66d5e23b685c526d7e5cc73dfd55838632fe0f5e.

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>

diff --git a/include/linux/timex.h b/include/linux/timex.h
index 92e01fc31ca604e69be2990d30f01c416ab44ce1..aa60fe7b6ed646f623253c24403e233654d71025 100644 (file)
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -234,9 +234,23 @@ struct timex {
 extern unsigned long tick_usec;                /* USER_HZ period (usec) */
 extern unsigned long tick_nsec;                /* ACTHZ          period (nsec) */
 
+/*
+ * phase-lock loop variables
+ */
+extern int time_status;                /* clock synchronization status bits */
+
 extern void ntp_init(void);
 extern void ntp_clear(void);
 
+/**
+ * ntp_synced - Returns 1 if the NTP status is not UNSYNC
+ *
+ */
+static inline int ntp_synced(void)
+{
+       return !(time_status & STA_UNSYNC);
+}
+
 /* Required to safely shift negative values */
 #define shift_right(x, s) ({   \
        __typeof__(x) __x = (x);        \
@@ -253,6 +267,7 @@ extern void ntp_clear(void);
 extern u64 tick_length;
 
 extern void second_overflow(void);
+extern void update_ntp_one_tick(void);
 extern int do_adjtimex(struct timex *);
 extern void hardpps(const struct timespec *, const struct timespec *);
 

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 22f481705dbca184552ca407baf2e8547e8fc4b9..4b85a7a72526e0e3a863e41a8b61b568754d83d0 100644 (file)
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -49,7 +49,7 @@ static struct hrtimer         leap_timer;
 static int                     time_state = TIME_OK;
 
 /* clock status bits:                                                  */
-static int                     time_status = STA_UNSYNC;
+int                            time_status = STA_UNSYNC;
 
 /* TAI offset (secs):                                                  */
 static long                    time_tai;
@@ -233,17 +233,6 @@ static inline void pps_fill_timex(struct timex *txc)
 
 #endif /* CONFIG_NTP_PPS */
 
-
-/**
- * ntp_synced - Returns 1 if the NTP status is not UNSYNC
- *
- */
-static inline int ntp_synced(void)
-{
-       return !(time_status & STA_UNSYNC);
-}
-
-
 /*
  * NTP methods:
  */