2010-01-28 23:02:59

by john stultz

Subject: [PATCH] ntp: Make time_esterror and time_maxerror static

Inspired by Richard's earlier email, I noticed the ntp.c has a few
global values that could be static. This trivial patch cleans that up.

thanks
-john


Make time_esterror and time_maxerror static as no one uses them outside
of ntp.c

Signed-off-by: John Stultz <[email protected]>

diff --git a/include/linux/timex.h b/include/linux/timex.h
index 94f8fae..7a082b3 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -238,9 +238,6 @@ extern int tickadj; /* amount of adjustment per tick */
* phase-lock loop variables
*/
extern int time_status; /* clock synchronization status bits */
-extern long time_maxerror; /* maximum error */
-extern long time_esterror; /* estimated error */
-
extern long time_adjust; /* The amount of adjtime left */

extern void ntp_init(void);
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 4800f93..74b1b37 100644
--- 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;

2010-01-29 09:34:14

by john stultz

Subject: [tip:timers/core] ntp: Make time_esterror and time_maxerror static

Commit-ID: 1f5b8f8a2031ae9507eb67743cad4d424739bfff
Gitweb: http://git.kernel.org/tip/1f5b8f8a2031ae9507eb67743cad4d424739bfff
Author: john stultz <[email protected]>
AuthorDate: Thu, 28 Jan 2010 15:02:41 -0800
Committer: Thomas Gleixner <[email protected]>
CommitDate: Fri, 29 Jan 2010 10:15:19 +0100

ntp: Make time_esterror and time_maxerror static

Make time_esterror and time_maxerror static as no one uses them
outside of ntp.c

Signed-off-by: John Stultz <[email protected]>
Cc: [email protected]
LKML-Reference: <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>

---
include/linux/timex.h | 3 ---
kernel/time/ntp.c | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/include/linux/timex.h b/include/linux/timex.h
index 94f8fae..7a082b3 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -238,9 +238,6 @@ extern int tickadj; /* amount of adjustment per tick */
* phase-lock loop variables
*/
extern int time_status; /* clock synchronization status bits */
-extern long time_maxerror; /* maximum error */
-extern long time_esterror; /* estimated error */
-
extern long time_adjust; /* The amount of adjtime left */

extern void ntp_init(void);
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 4800f93..74b1b37 100644
--- 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;