From patchwork Wed May 20 17:19:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 48817 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 382C821411 for ; Wed, 20 May 2015 17:20:14 +0000 (UTC) Received: by wizk4 with SMTP id k4sf22775136wiz.2 for ; Wed, 20 May 2015 10:20:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=WDCv2g4M4G0NU9yv6Ite1c6kxyQqO4xOlzx8KISCuLA=; b=Xhhj1eYCqjTVWdhcGDNTR21JcBWwE4jCjfqPW6QvkNpw0J2U1O0z7yQ0/puOWKx5Vh /AeG5GA7R2uaEXTMkPna2i9eTTPUscWsTytIrPtsefTT4+XIGxS72jp2/5IBR7GlwCTQ Gdjj2IZSzScFh8WK60RcywKITWvXGY+7GpBX9d9DW1AmVDSSHM/Pnle5Bzmqu3Z0pFig ET+TxX377WIKcXSSBaB0I9psG6nMng7rFEXDb0fbdIMBTIY9s0OPu8iWmPziLwNYz5nh yqHPIhKrdooBdqcenyNdJt/uzYJfEOMfAPhZHn9illOgVGJtdfcF2L0vFKxR0895SeUd DwUw== X-Gm-Message-State: ALoCoQmmlDmWj6BMqAP0+Br7x1Subld2uMcK3FLl/dMX1sp0ATtS3YRPfvHZ5SEDwpbqQltwnmfQ X-Received: by 10.180.106.10 with SMTP id gq10mr19427951wib.0.1432142412540; Wed, 20 May 2015 10:20:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.42 with SMTP id j10ls201327laf.27.gmail; Wed, 20 May 2015 10:20:12 -0700 (PDT) X-Received: by 10.152.45.98 with SMTP id l2mr27405866lam.77.1432142412373; Wed, 20 May 2015 10:20:12 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id bb9si11523614lab.145.2015.05.20.10.20.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 May 2015 10:20:12 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by lagv1 with SMTP id v1so84480967lag.3 for ; Wed, 20 May 2015 10:20:12 -0700 (PDT) X-Received: by 10.153.6.36 with SMTP id cr4mr27309724lad.56.1432142412277; Wed, 20 May 2015 10:20:12 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1678660lbb; Wed, 20 May 2015 10:20:11 -0700 (PDT) X-Received: by 10.66.156.225 with SMTP id wh1mr66912640pab.100.1432142399289; Wed, 20 May 2015 10:19:59 -0700 (PDT) Received: from mail-pa0-f47.google.com (mail-pa0-f47.google.com. [209.85.220.47]) by mx.google.com with ESMTPS id ev6si27405982pdb.91.2015.05.20.10.19.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 May 2015 10:19:59 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.47 as permitted sender) client-ip=209.85.220.47; Received: by pacwv17 with SMTP id wv17so74073265pac.2 for ; Wed, 20 May 2015 10:19:57 -0700 (PDT) X-Received: by 10.70.133.170 with SMTP id pd10mr65552517pdb.127.1432142397829; Wed, 20 May 2015 10:19:57 -0700 (PDT) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id fp3sm16745952pdb.52.2015.05.20.10.19.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 May 2015 10:19:57 -0700 (PDT) From: John Stultz To: LKML Cc: Xunlei Pang , Thomas Gleixner , Ingo Molnar , John Stultz Subject: [PATCH 7/7] time: Remove read_boot_clock() Date: Wed, 20 May 2015 10:19:36 -0700 Message-Id: <1432142376-2077-8-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1432142376-2077-1-git-send-email-john.stultz@linaro.org> References: <1432142376-2077-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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. Cc: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Xunlei Pang Signed-off-by: John Stultz --- 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;