From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754878AbbBONML (ORCPT ); Sun, 15 Feb 2015 08:12:11 -0500 Received: from m50-110.126.com ([123.125.50.110]:48895 "EHLO m50-110.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754753AbbBONMJ (ORCPT ); Sun, 15 Feb 2015 08:12:09 -0500 From: Xunlei Pang To: linux-kernel@vger.kernel.org Cc: rtc-linux@googlegroups.com, Thomas Gleixner , Alessandro Zummo , John Stultz , Arnd Bergmann , Peter Zijlstra , Xunlei Pang Subject: [PATCH v4 1/4] time: Add needed macros for timekeeping_inject_sleeptime64() Date: Sun, 15 Feb 2015 21:09:42 +0800 Message-Id: <1424005785-17865-1-git-send-email-xlpang@126.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: jdKowABXINyomuBUw_mjCw--.246S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrKr18tF4kXw17CF17GFyrtFb_yoWkGrX_WF 92qFyku3W5AFyFg3yakan7XF98Kw4UGr4kZayIqF1xXrs0k3y8Aws3try5XrnxCF4xKwnx Can8Gry7Kr15WjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUnenmtUUUUU== X-Originating-IP: [210.21.223.3] X-CM-SenderInfo: p0ost0bj6rjloofrz/1tbipAehv1GofbGWkQAAsP Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xunlei Pang timekeeping_inject_sleeptime64() is only used by RTC suspend/resume, so embrace it in RTC related macros. Signed-off-by: Xunlei Pang --- kernel/time/timekeeping.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index b124af2..d78a528 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1125,6 +1125,9 @@ static void __timekeeping_inject_sleeptime(struct timekeeper *tk, tk_debug_account_sleep_time(delta); } +#if defined(CONFIG_RTC_CLASS) && \ + 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 @@ -1162,6 +1165,7 @@ void timekeeping_inject_sleeptime64(struct timespec64 *delta) /* signal hrtimers about time change */ clock_was_set(); } +#endif /** * timekeeping_resume - Resumes the generic timekeeping subsystem. -- 1.9.1