From patchwork Thu Apr 2 03:34:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 46690 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 64C18216D1 for ; Thu, 2 Apr 2015 03:35:37 +0000 (UTC) Received: by lbfb1 with SMTP id b1sf14473571lbf.2 for ; Wed, 01 Apr 2015 20:35:36 -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=Mtc6gY7paAAP2fn5csT9lQc/8aYql9RCfyunnKDlgjc=; b=A4SZcZmVefxNb9jgkOFG1G4MW52RPMFw8g8Lq10tDXItSy5tJehEAAUpF8EIe9hz+W QxXQUmPVYaCy3Qx9yBfsr/cvdlMsuTF9ntsMDogLNqI9AUOVXF8r2iLf+k/E0KoxUv+/ irVFvbDWsY8AybLMWLCigdGm22UpvjL9CfEZE/qXfzGk88kAYQYnSNN+w3nWbvEIJ/Rh kqGQrgtucxb7yOW/fpIk5aJlvSPIEU5NsKLMyfb2JuEvyLFZlTSurfpjub0mzQ4or9AX JdyUWouRkfWJISz07czm9N6Fm8IKtFPHzdEAXB93CPsmWpP+DPak1vAEzZ+iO3vmYARs odPQ== X-Gm-Message-State: ALoCoQkkxl989GT1m+cXz9fHQ7PlXQxSIn86H4fP+mRFGJdrGS6bwMeHUW7wYhJ+t+Wmjgk2E29j X-Received: by 10.152.184.73 with SMTP id es9mr708203lac.4.1427945736314; Wed, 01 Apr 2015 20:35:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.5.2 with SMTP id ci2ls142814lad.38.gmail; Wed, 01 Apr 2015 20:35:36 -0700 (PDT) X-Received: by 10.152.18.225 with SMTP id z1mr39170298lad.124.1427945736047; Wed, 01 Apr 2015 20:35:36 -0700 (PDT) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id f4si3143995lbd.26.2015.04.01.20.35.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Apr 2015 20:35:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by lbdc10 with SMTP id c10so50290449lbd.2 for ; Wed, 01 Apr 2015 20:35:36 -0700 (PDT) X-Received: by 10.112.46.74 with SMTP id t10mr11942009lbm.73.1427945735962; Wed, 01 Apr 2015 20:35:35 -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.57.201 with SMTP id k9csp1063390lbq; Wed, 1 Apr 2015 20:35:35 -0700 (PDT) X-Received: by 10.68.253.162 with SMTP id ab2mr83632796pbd.62.1427945705692; Wed, 01 Apr 2015 20:35:05 -0700 (PDT) Received: from mail-pd0-f180.google.com (mail-pd0-f180.google.com. [209.85.192.180]) by mx.google.com with ESMTPS id nc3si5483835pbc.148.2015.04.01.20.35.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Apr 2015 20:35:05 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.192.180 as permitted sender) client-ip=209.85.192.180; Received: by pdea3 with SMTP id a3so24277054pde.3 for ; Wed, 01 Apr 2015 20:35:04 -0700 (PDT) X-Received: by 10.70.109.197 with SMTP id hu5mr82739596pdb.98.1427945704819; Wed, 01 Apr 2015 20:35:04 -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 da10sm3572603pac.42.2015.04.01.20.35.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Apr 2015 20:35:03 -0700 (PDT) From: John Stultz To: lkml Cc: Xunlei Pang , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , John Stultz Subject: [PATCH 15/21] time: Don't build timekeeping_inject_sleeptime64() if no one uses it Date: Wed, 1 Apr 2015 20:34:35 -0700 Message-Id: <1427945681-29972-16-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427945681-29972-1-git-send-email-john.stultz@linaro.org> References: <1427945681-29972-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.217.174 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 timekeeping_inject_sleeptime64() is only used by RTC suspend/resume, so add build dependencies on the necessary RTC related macros. Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Xunlei Pang [jstultz: Improve commit message clarity] Signed-off-by: John Stultz --- kernel/time/timekeeping.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 39df498..7d799d3 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1280,6 +1280,7 @@ static void __timekeeping_inject_sleeptime(struct timekeeper *tk, tk_debug_account_sleep_time(delta); } +#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_RTC_HCTOSYS_DEVICE) /** * timekeeping_inject_sleeptime64 - Adds suspend interval to timeekeeping values * @delta: pointer to a timespec64 delta value @@ -1317,6 +1318,7 @@ void timekeeping_inject_sleeptime64(struct timespec64 *delta) /* signal hrtimers about time change */ clock_was_set(); } +#endif /** * timekeeping_resume - Resumes the generic timekeeping subsystem.