[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-e1292ba164742e3a236e407148e00300b7196906@git.kernel.org>
Date: Tue, 23 Mar 2010 16:21:38 GMT
From: tip-bot for John Stultz <johnstul@...ibm.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
johnstul@...ibm.com, tglx@...utronix.de
Subject: [tip:timers/core] ntp: Make time_adjust static
Commit-ID: e1292ba164742e3a236e407148e00300b7196906
Gitweb: http://git.kernel.org/tip/e1292ba164742e3a236e407148e00300b7196906
Author: John Stultz <johnstul@...ibm.com>
AuthorDate: Thu, 18 Mar 2010 20:19:27 -0700
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Tue, 23 Mar 2010 17:19:37 +0100
ntp: Make time_adjust static
Now that no arches are accessing time_adjust directly,
make it static.
Signed-off-by: John Stultz <johnstul@...ibm.com>
LKML-Reference: <1268968769-19209-1-git-send-email-johnstul@...ibm.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
include/linux/timex.h | 1 -
kernel/time/ntp.c | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/include/linux/timex.h b/include/linux/timex.h
index 7a082b3..e2de51e 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -238,7 +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_adjust; /* The amount of adjtime left */
extern void ntp_init(void);
extern void ntp_clear(void);
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 7c0f180..c631168 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -69,7 +69,7 @@ static s64 time_freq;
/* time at last adjustment (secs): */
static long time_reftime;
-long time_adjust;
+static long time_adjust;
/* constant (boot-param configurable) NTP tick adjustment (upscaled) */
static s64 ntp_tick_adj;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists