From patchwork Sat Jul 26 04:37:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 34338 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6644D20551 for ; Sat, 26 Jul 2014 04:37:28 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id kx10sf35522404pab.8 for ; Fri, 25 Jul 2014 21:37:27 -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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=ZkWO6igPFmJ4GA+7sWlnlHjfx2OZ+13MZJmVL6Dof44=; b=IaQM0kgTZA3r0rBsl6Ys/FAz9qlbwRL70Od+SNrZ4Ck0Ml5EH83PzRtgBi0WY7HRWd wnZ95Ldilv6hhgmJMzNaVsJpbvHnAs+vDyWeTv4tEr4s7QFhExUiZsfjXl/WvkcQtD3t Yh/KKYKRYt9DtvwKemSI+WlKqpSp8457JmIq15SIYJVFxyY0d4r0eMrP1jF7Z45sMh8Y VvAFgWeCOqxERkCbnGsAfcTZ3SZObL2gZsbCTb1adIiZIktHWCAxGIpYl49aQCRBv6cd 2TvzK/n2yFwKodGTWxORY0qA0dkKoxMtL9oVeuEgSR+4Du8kwv9KN7DDK6BIJLFFWhpS Wxow== X-Gm-Message-State: ALoCoQmIZkm8bCzuHBGDA3B20XFQNzpHIkwtFl9JNeWBvbmvgaqXN3jezMGL37rxZAqjZRVkpnen X-Received: by 10.66.90.193 with SMTP id by1mr44259pab.30.1406349447533; Fri, 25 Jul 2014 21:37:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.97.198 with SMTP id m64ls1344403qge.39.gmail; Fri, 25 Jul 2014 21:37:27 -0700 (PDT) X-Received: by 10.224.20.200 with SMTP id g8mr34546694qab.88.1406349447413; Fri, 25 Jul 2014 21:37:27 -0700 (PDT) Received: from mail-qg0-f43.google.com (mail-qg0-f43.google.com [209.85.192.43]) by mx.google.com with ESMTPS id g14si19487945qay.114.2014.07.25.21.37.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 25 Jul 2014 21:37:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.192.43 as permitted sender) client-ip=209.85.192.43; Received: by mail-qg0-f43.google.com with SMTP id a108so6018559qge.2 for ; Fri, 25 Jul 2014 21:37:27 -0700 (PDT) X-Received: by 10.140.36.149 with SMTP id p21mr34498062qgp.54.1406349447282; Fri, 25 Jul 2014 21:37:27 -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.96.16.166 with SMTP id h6csp74722qdd; Fri, 25 Jul 2014 21:37:26 -0700 (PDT) X-Received: by 10.66.66.229 with SMTP id i5mr23569388pat.47.1406349446437; Fri, 25 Jul 2014 21:37:26 -0700 (PDT) Received: from mail-pa0-f48.google.com (mail-pa0-f48.google.com [209.85.220.48]) by mx.google.com with ESMTPS id ai3si9455408pbd.67.2014.07.25.21.37.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 25 Jul 2014 21:37:25 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.48 as permitted sender) client-ip=209.85.220.48; Received: by mail-pa0-f48.google.com with SMTP id et14so7178178pad.21 for ; Fri, 25 Jul 2014 21:37:25 -0700 (PDT) X-Received: by 10.68.160.163 with SMTP id xl3mr23532863pbb.39.1406349445421; Fri, 25 Jul 2014 21:37:25 -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 r3sm14018284pdd.8.2014.07.25.21.37.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Jul 2014 21:37:24 -0700 (PDT) From: John Stultz To: linux-kernel@vger.kernel.org Cc: John Stultz , Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Subject: [PATCH] timekeeping: Fixup typo in update_vsyscall_old definition Date: Fri, 25 Jul 2014 21:37:19 -0700 Message-Id: <1406349439-11785-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 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.192.43 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: , In commit 4a0e637738f0 ("clocksource: Get rid of cycle_last"), currently in the -tip tree, there was a small typo where cycles_t was used intstead of cycle_t. This broke ppc64 builds. Fix this by using the proper cycle_t type for this usage, in both the definition and the ia64 implementation. Now, having both cycle_t and cycles_t types seems like a very bad idea just asking for these sorts of issues. But that will be a cleanup for another day. Cc: Stephen Rothwell Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Peter Zijlstra Reported-by: Stephen Rothwell Signed-off-by: John Stultz --- Note: This should be visibly correct, and I've test built on ppc64, but I don't have an ia64 toolchain, so if anyone could give this a build whirl on ia64, I'd appreciate it. arch/ia64/kernel/time.c | 2 +- include/linux/timekeeper_internal.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 11dc42d..3e71ef8 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c @@ -441,7 +441,7 @@ void update_vsyscall_tz(void) } void update_vsyscall_old(struct timespec *wall, struct timespec *wtm, - struct clocksource *c, u32 mult, cycles_t cycle_last) + struct clocksource *c, u32 mult, cycle_t cycle_last) { write_seqcount_begin(&fsyscall_gtod_data.seq); diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h index e9660e5..95640dc 100644 --- a/include/linux/timekeeper_internal.h +++ b/include/linux/timekeeper_internal.h @@ -113,7 +113,7 @@ extern void update_vsyscall_tz(void); extern void update_vsyscall_old(struct timespec *ts, struct timespec *wtm, struct clocksource *c, u32 mult, - cycles_t cycle_last); + cycle_t cycle_last); extern void update_vsyscall_tz(void); #else