summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2011-11-14 13:06:21 -0800
committerJohn Stultz <john.stultz@linaro.org>2012-01-26 19:44:20 -0800
commit8357929e6ae3661d5a3a7378a717f29873ea18c6 (patch)
tree49cee3ead7619a7a7a8ae2dd01c4a8b1f9e8add9
parent70471f2f061d59375e959b4e7d47ee62121babb1 (diff)
downloadop-kernel-dev-8357929e6ae3661d5a3a7378a717f29873ea18c6.zip
op-kernel-dev-8357929e6ae3661d5a3a7378a717f29873ea18c6.tar.gz
ntp: Cleanup timex.h
Move ntp_sycned to ntp.c and mark time_status as static. Also yank function declaration for non-existant function. CC: Thomas Gleixner <tglx@linutronix.de> CC: Eric Dumazet <eric.dumazet@gmail.com> CC: Richard Cochran <richardcochran@gmail.com> Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--include/linux/timex.h15
-rw-r--r--kernel/time/ntp.c13
2 files changed, 12 insertions, 16 deletions
diff --git a/include/linux/timex.h b/include/linux/timex.h
index aa60fe7..92e01fc 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -234,23 +234,9 @@ 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); \
@@ -267,7 +253,6 @@ static inline int ntp_synced(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 f6117a4..ae7e136 100644
--- 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: */
-int time_status = STA_UNSYNC;
+static int time_status = STA_UNSYNC;
/* TAI offset (secs): */
static long time_tai;
@@ -233,6 +233,17 @@ 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:
*/
OpenPOWER on IntegriCloud