From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753250AbbDCIUT (ORCPT ); Fri, 3 Apr 2015 04:20:19 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44746 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751863AbbDCIUL (ORCPT ); Fri, 3 Apr 2015 04:20:11 -0400 Date: Fri, 3 Apr 2015 01:19:39 -0700 From: tip-bot for Xunlei Pang Message-ID: Cc: mingo@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, pang.xunlei@linaro.org, hpa@zytor.com, john.stultz@linaro.org Reply-To: john.stultz@linaro.org, peterz@infradead.org, mingo@kernel.org, hpa@zytor.com, pang.xunlei@linaro.org, tglx@linutronix.de, linux-kernel@vger.kernel.org In-Reply-To: <1427945681-29972-16-git-send-email-john.stultz@linaro.org> References: <1427945681-29972-16-git-send-email-john.stultz@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] time: Don' t build timekeeping_inject_sleeptime64() if no one uses it Git-Commit-ID: 7f2981393af31a854879f2496cab4c978e886902 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 7f2981393af31a854879f2496cab4c978e886902 Gitweb: http://git.kernel.org/tip/7f2981393af31a854879f2496cab4c978e886902 Author: Xunlei Pang AuthorDate: Wed, 1 Apr 2015 20:34:35 -0700 Committer: Ingo Molnar CommitDate: Fri, 3 Apr 2015 08:18:31 +0200 time: Don't build timekeeping_inject_sleeptime64() if no one uses it timekeeping_inject_sleeptime64() is only used by RTC suspend/resume, so add build dependencies on the necessary RTC related macros. Signed-off-by: Xunlei Pang [ Improve commit message clarity. ] Signed-off-by: John Stultz Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1427945681-29972-16-git-send-email-john.stultz@linaro.org Signed-off-by: Ingo Molnar --- kernel/time/timekeeping.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index b1dbfa5..3be559b 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.