From: John Stultz <john.stultz@linaro.org>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Xunlei Pang <pang.xunlei@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>,
John Stultz <john.stultz@linaro.org>
Subject: [PATCH 7/7] time: Remove read_boot_clock()
Date: Wed, 20 May 2015 10:19:36 -0700 [thread overview]
Message-ID: <1432142376-2077-8-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1432142376-2077-1-git-send-email-john.stultz@linaro.org>
From: Xunlei Pang <pang.xunlei@linaro.org>
Now we have all the read_boot_clock64() for all implementations,
it's time to remove read_boot_clock() completely from the kernel.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
include/linux/timekeeping.h | 1 -
kernel/time/timekeeping.c | 14 +++-----------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index 9af5c12..3aa72e6 100644
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -267,7 +267,6 @@ extern int persistent_clock_is_local;
extern void read_persistent_clock(struct timespec *ts);
extern void read_persistent_clock64(struct timespec64 *ts);
-extern void read_boot_clock(struct timespec *ts);
extern void read_boot_clock64(struct timespec64 *ts);
extern int update_persistent_clock(struct timespec now);
extern int update_persistent_clock64(struct timespec64 now);
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 2f10b65..90ed5db 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1188,28 +1188,20 @@ void __weak read_persistent_clock64(struct timespec64 *ts64)
}
/**
- * read_boot_clock - Return time of the system start.
+ * read_boot_clock64 - Return time of the system start.
*
* Weak dummy function for arches that do not yet support it.
* Function to read the exact time the system has been started.
- * Returns a timespec with tv_sec=0 and tv_nsec=0 if unsupported.
+ * Returns a timespec64 with tv_sec=0 and tv_nsec=0 if unsupported.
*
* XXX - Do be sure to remove it once all arches implement it.
*/
-void __weak read_boot_clock(struct timespec *ts)
+void __weak read_boot_clock64(struct timespec64 *ts)
{
ts->tv_sec = 0;
ts->tv_nsec = 0;
}
-void __weak read_boot_clock64(struct timespec64 *ts64)
-{
- struct timespec ts;
-
- read_boot_clock(&ts);
- *ts64 = timespec_to_timespec64(ts);
-}
-
/* Flag for if timekeeping_resume() has injected sleeptime */
static bool sleeptime_injected;
--
1.9.1
next prev parent reply other threads:[~2015-05-20 17:20 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-20 17:19 [PATCH 0/7] Current queue for tip/timers/core John Stultz
2015-05-20 17:19 ` [PATCH 1/7] time: make sure tz_minuteswest is set to a valid value when setting time John Stultz
2015-05-20 17:19 ` [PATCH 2/7] timekeeping: Provide new API to get the current time resolution John Stultz
2015-05-20 17:53 ` Harald Geyer
2015-05-20 18:04 ` John Stultz
2015-05-20 18:55 ` Harald Geyer
2015-05-20 17:19 ` [PATCH 3/7] time: Rework debugging variables so they aren't global John Stultz
2015-05-21 6:14 ` Ingo Molnar
2015-05-20 17:19 ` [PATCH 4/7] tracing: timer: Add deferrable flag to timer_start John Stultz
2015-05-21 6:18 ` Ingo Molnar
2015-05-22 22:58 ` Thomas Gleixner
2015-05-23 8:17 ` Ingo Molnar
2015-05-24 6:20 ` Ingo Molnar
2015-05-20 17:19 ` [PATCH 5/7] time: include math64.h in time64.h John Stultz
2015-05-21 6:20 ` Ingo Molnar
2015-05-20 17:19 ` [PATCH 6/7] s390: time: Provide read_boot_clock64() and read_persistent_clock64() John Stultz
2015-05-21 6:23 ` Ingo Molnar
2015-05-20 17:19 ` John Stultz [this message]
2015-05-21 6:25 ` [PATCH 7/7] time: Remove read_boot_clock() Ingo Molnar
2015-05-20 18:42 ` [PATCH 0/7] Current queue for tip/timers/core John Stultz
2015-05-21 6:19 ` Ingo Molnar
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=1432142376-2077-8-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=pang.xunlei@linaro.org \
--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
all inboxes | Powered by JetHome®