From patchwork Mon Mar 9 06:27:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xunlei Pang X-Patchwork-Id: 45526 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 74D86214AE for ; Mon, 9 Mar 2015 06:30:21 +0000 (UTC) Received: by wggx13 with SMTP id x13sf17089104wgg.0 for ; Sun, 08 Mar 2015 23:30:20 -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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=hBmXZteaNiXseFQWyTTCGcJGQdKO/UTyVtpuuoNhrHU=; b=jn+CY6KxDleNZlkwUPXguUaLaA1tYtmapgmueIm10HQ1+1YD4N06DPoFdS1XYIoC6x hCe/IS8umJzbq00U2hr1dxtEnM7S495g6f/ANtVXEyaBgxURXSdiF3G7YkF13vXvcszU ajGbvkrAmCglz3RggFk63hN8JBPn1tnkcFEboVuS/VHBDkaVBhOxmE0IyrPKLUWuv6oN KjJkq7Ju2O8C8Xqi+Q/042nr9m2AopvGQHHnAT4gmH3pRro/Z6c+l70IUhnXnTdNhdJg FP2zr6axk3ZUm6At7Qm4cuakLFrdox/zJVsU/fRIwpf2Esh/eXF/ybvDBku/kIXWiYo/ lSJQ== X-Gm-Message-State: ALoCoQkyKKzWz6vY+PjYL5qGxtEu792QIkdA4QpyBV8C/GdjfKFcp3mJS/jklpVchnAQqOSv/1an X-Received: by 10.194.11.70 with SMTP id o6mr3669993wjb.6.1425882620747; Sun, 08 Mar 2015 23:30:20 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.115.135 with SMTP id jo7ls11486lab.101.gmail; Sun, 08 Mar 2015 23:30:20 -0700 (PDT) X-Received: by 10.112.17.67 with SMTP id m3mr24141907lbd.109.1425882620487; Sun, 08 Mar 2015 23:30:20 -0700 (PDT) Received: from mail-lb0-x22d.google.com (mail-lb0-x22d.google.com. [2a00:1450:4010:c04::22d]) by mx.google.com with ESMTPS id t9si13449830lal.77.2015.03.08.23.30.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Mar 2015 23:30:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::22d as permitted sender) client-ip=2a00:1450:4010:c04::22d; Received: by lbdu10 with SMTP id u10so21893305lbd.4 for ; Sun, 08 Mar 2015 23:30:20 -0700 (PDT) X-Received: by 10.152.197.34 with SMTP id ir2mr24034659lac.36.1425882620398; Sun, 08 Mar 2015 23:30:20 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp1282243lbj; Sun, 8 Mar 2015 23:30:19 -0700 (PDT) X-Received: by 10.70.20.164 with SMTP id o4mr49786798pde.106.1425882617174; Sun, 08 Mar 2015 23:30:17 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fu7si10425782pdb.48.2015.03.08.23.30.15; Sun, 08 Mar 2015 23:30:17 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752083AbbCIGaF (ORCPT + 28 others); Mon, 9 Mar 2015 02:30:05 -0400 Received: from m50-111.126.com ([123.125.50.111]:57017 "EHLO m50-111.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751778AbbCIGaB (ORCPT ); Mon, 9 Mar 2015 02:30:01 -0400 Received: from localhost.localdomain (unknown [210.21.223.3]) by smtp5 (Coremail) with SMTP id jtKowAD3dKpwPf1UBXZyAA--.189S2; Mon, 09 Mar 2015 14:28:13 +0800 (CST) 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 v5 1/4] time: Add needed macros for timekeeping_inject_sleeptime64() Date: Mon, 9 Mar 2015 14:27:48 +0800 Message-Id: <1425882471-5591-1-git-send-email-xlpang@126.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: jtKowAD3dKpwPf1UBXZyAA--.189S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrKr18tF4kXw1rCrWrtry3CFg_yoWkGrX_WF 92qFykC3W5Jryv93yakan7XF90kw4UGr48ZayIqFyxXrs0k3y8Awsayry5ZrnxCa1xGwnx Can8Gry7Kr15WjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUnenmtUUUUU== X-Originating-IP: [210.21.223.3] X-CM-SenderInfo: p0ost0bj6rjloofrz/1tbiXB63v1R0VG20-wAAsY Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Original-Sender: xlpang@126.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::22d as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@; dmarc=fail (p=NONE dis=NONE) header.from=126.com Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org 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 embrace it in RTC related macros. Signed-off-by: Xunlei Pang --- v5 changes: Remove CONFIG_RTC_CLASS. kernel/time/timekeeping.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index b124af2..49b1643 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1125,6 +1125,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 @@ -1162,6 +1163,7 @@ void timekeeping_inject_sleeptime64(struct timespec64 *delta) /* signal hrtimers about time change */ clock_was_set(); } +#endif /** * timekeeping_resume - Resumes the generic timekeeping subsystem.