From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932343AbbDIBG6 (ORCPT ); Wed, 8 Apr 2015 21:06:58 -0400 Received: from m50-110.126.com ([123.125.50.110]:50583 "EHLO m50-110.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754938AbbDIBG4 (ORCPT ); Wed, 8 Apr 2015 21:06:56 -0400 From: Xunlei Pang To: linux-kernel@vger.kernel.org Cc: John Stultz , Arnd Bergmann , Thomas Gleixner , Martin Schwidefsky , Heiko Carstens , linux390@de.ibm.com, Xunlei Pang Subject: [PATCH 3/3] time: Remove read_boot_clock() Date: Thu, 9 Apr 2015 09:04:42 +0800 Message-Id: <1428541482-3181-3-git-send-email-xlpang@126.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1428541482-3181-1-git-send-email-xlpang@126.com> References: <1428541482-3181-1-git-send-email-xlpang@126.com> X-CM-TRANSID: jdKowAAHDPQu0CVVDnXtAA--.11469S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7CFWrtr4xKw4xXw18Jw4DXFb_yoW8uFyfpF W2kw1UGrWDJF4Uurn2y393Z347Kwn8tF47t3yfu34Fyry0qF1xtr1rC3yFvryDJF4fuws8 ZF10vFsI9w1UZrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jkrcfUUUUU= X-Originating-IP: [210.21.223.3] X-CM-SenderInfo: p0ost0bj6rjloofrz/1tbiXBbWv1R0VkNuWwAAsj Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xunlei Pang Now we have all the read_boot_clock64() for all implementations, it's time to remove read_boot_clock() completely from the kernel. Signed-off-by: Xunlei Pang --- 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 99176af..88e5f2e 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -266,7 +266,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 946acb7..87f0ea5 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1179,28 +1179,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