From: John Stultz <john.stultz@linaro.org>
To: LKML <linux-kernel@vger.kernel.org>
Cc: John Stultz <john.stultz@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
Eric Dumazet <eric.dumazet@gmail.com>,
Richard Cochran <richardcochran@gmail.com>
Subject: [PATCH 07/16] ntp: Cleanup timex.h
Date: Mon, 14 Nov 2011 20:03:57 -0800 [thread overview]
Message-ID: <1321329846-14755-8-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1321329846-14755-1-git-send-email-john.stultz@linaro.org>
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>
---
include/linux/timex.h | 15 ---------------
kernel/time/ntp.c | 13 ++++++++++++-
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:
*/
--
1.7.3.2.146.gca209
next prev parent reply other threads:[~2011-11-15 4:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-15 4:03 [PATCH 00/16] Timekeeping cleanups and locking changes John Stultz
2011-11-15 4:03 ` [PATCH 01/16] time: Move total_sleep_time into the timekeeper structure John Stultz
2011-11-15 4:03 ` [PATCH 02/16] time: Move wall_to_monotonic " John Stultz
2011-11-15 4:03 ` [PATCH 03/16] time: Move xtime into timekeeeper structure John Stultz
2011-11-15 4:03 ` [PATCH 04/16] time: Move raw_time into timekeeper structure John Stultz
2011-11-15 4:03 ` [PATCH 05/16] time: Cleanup global variables and move them to the top John Stultz
2011-11-15 4:03 ` [PATCH 06/16] time: Add timekeeper lock John Stultz
2011-11-15 4:03 ` John Stultz [this message]
2011-11-15 4:03 ` [PATCH 08/16] ntp: Access tick_length variable via ntp_tick_length() John Stultz
2011-11-15 4:03 ` [PATCH 09/16] ntp: Add ntp_lock to replace xtime_locking John Stultz
2011-11-15 4:04 ` [PATCH 10/16] time: Remove most of xtime_lock usage in timekeeping.c John Stultz
2011-11-15 4:04 ` [PATCH 11/16] time: Reorder so the hot data is together John Stultz
2011-11-15 4:04 ` [PATCH 12/16] time: Move common updates to a function John Stultz
2011-11-15 4:04 ` [PATCH 13/16] time: Condense timekeeper.xtime into xtime_sec John Stultz
2011-11-15 4:04 ` [PATCH 14/16] time: Rework timekeeping functions to take timekeeper ptr as argument John Stultz
2011-11-15 4:04 ` [PATCH 15/16] time: Update tiemkeeper structure using a local shadow John Stultz
2011-11-17 22:03 ` John Stultz
2011-11-15 4:04 ` [PATCH 16/16] time: Rework update_vsyscall to pass timekeeper John Stultz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1321329846-14755-8-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=eric.dumazet@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=richardcochran@gmail.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).