From patchwork Mon Aug 17 20:40:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 52480 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by patches.linaro.org (Postfix) with ESMTPS id 627572156D for ; Mon, 17 Aug 2015 20:41:23 +0000 (UTC) Received: by lagz9 with SMTP id z9sf50800570lag.3 for ; Mon, 17 Aug 2015 13:41:22 -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=uBMTGkmR1HKOi153WvIcxogqL/SKlb6MSEEAfDERTBk=; b=aBjkWsXtFonASVIOyB3BIiiFiEqvcrq8vkEz4QDM3Mc0hncUY34giM4crHxoBbl9bE QhGLugEryhzPgQA4AqnldpiDXG0H3mhlrCAYw4B1Y4IS4n2CSBbw/RA8bEUS3kgDGPhE 0XiF5hRIot3ENyQmh1+/n6e17g5/SDZvma/N9ArlsARoiGX0YSrzY+OcmwESpeZRU5Js 6WDJ6xVb/bbwxoR7sek1CMgBBs1zm8cUlMHNM/KQCqMB9KU7WxSpXG/Qrl5RteeATPHq mP5EefwrOEISi0HV9kqOV9saAR9endGAV28PTVy2p4CTL2FJQPzxotXNHDLJSpaoUnik gphw== X-Gm-Message-State: ALoCoQlUC0OYjKl8UCZnLTXGroaKMaCoYNyheA9YiNTvmCZVISFNasYvr1UNUNws3fGGU13xGjMA X-Received: by 10.112.148.101 with SMTP id tr5mr814013lbb.13.1439844082391; Mon, 17 Aug 2015 13:41:22 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.179.130 with SMTP id dg2ls687140lac.108.gmail; Mon, 17 Aug 2015 13:41:22 -0700 (PDT) X-Received: by 10.112.149.164 with SMTP id ub4mr2652654lbb.65.1439844081993; Mon, 17 Aug 2015 13:41:21 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id q10si12364609lbp.109.2015.08.17.13.41.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Aug 2015 13:41:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by lahi9 with SMTP id i9so86453137lah.2 for ; Mon, 17 Aug 2015 13:41:21 -0700 (PDT) X-Received: by 10.112.67.65 with SMTP id l1mr2632960lbt.86.1439844081732; Mon, 17 Aug 2015 13:41:21 -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.162.200 with SMTP id yc8csp85908lbb; Mon, 17 Aug 2015 13:41:20 -0700 (PDT) X-Received: by 10.68.65.16 with SMTP id t16mr6174606pbs.48.1439844074035; Mon, 17 Aug 2015 13:41:14 -0700 (PDT) Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com. [209.85.220.54]) by mx.google.com with ESMTPS id p10si26320902pds.132.2015.08.17.13.41.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Aug 2015 13:41:14 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.54 as permitted sender) client-ip=209.85.220.54; Received: by pawq9 with SMTP id q9so18141447paw.3 for ; Mon, 17 Aug 2015 13:41:13 -0700 (PDT) X-Received: by 10.68.192.9 with SMTP id hc9mr6092928pbc.57.1439844073125; Mon, 17 Aug 2015 13:41:13 -0700 (PDT) Received: from localhost.localdomain (c-76-115-103-22.hsd1.or.comcast.net. [76.115.103.22]) by smtp.gmail.com with ESMTPSA id gu2sm85199pbc.1.2015.08.17.13.41.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Aug 2015 13:41:12 -0700 (PDT) From: John Stultz To: lkml Cc: Xunlei Pang , Prarit Bhargava , Richard Cochran , Ingo Molnar , Thomas Gleixner , Arnd Bergmann , John Stultz Subject: [PATCH 4/9] time: Add the common weak version of update_persistent_clock() Date: Mon, 17 Aug 2015 13:40:58 -0700 Message-Id: <1439844063-7957-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439844063-7957-1-git-send-email-john.stultz@linaro.org> References: <1439844063-7957-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.51 as permitted sender) smtp.mailfrom=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 The weak update_persistent_clock64() calls update_persistent_clock(), if the architecture defines an update_persistent_clock64() to replace and remove its update_persistent_clock() version, when building the kernel the linker will throw an undefined symbol error, that is, any arch that switches to update_persistent_clock64() will have this issue. To solve the issue, we add the common weak update_persistent_clock(). Cc: Prarit Bhargava Cc: Richard Cochran Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Arnd Bergmann Signed-off-by: Xunlei Pang Signed-off-by: John Stultz --- kernel/time/ntp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index fb4d98c..df68cb8 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -487,6 +487,11 @@ out: } #ifdef CONFIG_GENERIC_CMOS_UPDATE +int __weak update_persistent_clock(struct timespec now) +{ + return -ENODEV; +} + int __weak update_persistent_clock64(struct timespec64 now64) { struct timespec now;