From: tip-bot for John Stultz <johnstul@us.ibm.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
johnstul@us.ibm.com, tglx@linutronix.de
Subject: [tip:timers/core] ntp: Make time_adjust static
Date: Tue, 23 Mar 2010 16:21:38 GMT [thread overview]
Message-ID: <tip-e1292ba164742e3a236e407148e00300b7196906@git.kernel.org> (raw)
In-Reply-To: <1268968769-19209-1-git-send-email-johnstul@us.ibm.com>
Commit-ID: e1292ba164742e3a236e407148e00300b7196906
Gitweb: http://git.kernel.org/tip/e1292ba164742e3a236e407148e00300b7196906
Author: John Stultz <johnstul@us.ibm.com>
AuthorDate: Thu, 18 Mar 2010 20:19:27 -0700
Committer: Thomas Gleixner <tglx@linutronix.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@us.ibm.com>
LKML-Reference: <1268968769-19209-1-git-send-email-johnstul@us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.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;
prev parent reply other threads:[~2010-03-23 16:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-19 3:19 [PATCH] ntp: Make time_adjust static John Stultz
2010-03-19 3:19 ` [PATCH] ntp: Remove tickadj John Stultz
2010-03-23 16:21 ` [tip:timers/core] " tip-bot for John Stultz
2010-03-23 16:21 ` tip-bot for John Stultz [this message]
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=tip-e1292ba164742e3a236e407148e00300b7196906@git.kernel.org \
--to=johnstul@us.ibm.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.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