From patchwork Wed May 22 13:22:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 164819 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp859523ili; Wed, 22 May 2019 06:23:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqy0wsRklxMgN9lnuCQWzGLjerOBElbkfHoaMUx0WNFMMnFbl5Paouv2lfJiAvSx/jTaD4Ql X-Received: by 2002:a63:a1a:: with SMTP id 26mr89627034pgk.11.1558531432395; Wed, 22 May 2019 06:23:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558531432; cv=none; d=google.com; s=arc-20160816; b=DhRuHII0owQMNm6ypQs4XYdvgBKzJOwoMOELoIfEMjfsnUcjGu68J5Jx53n82wi3EB sR1BuW3zwwpVxF98+D9vqNbSI5S/+Dg/lb5oXvKlY6AZ6lTFOKtx9bCrutCX86rnMrjO ROXOfrwD9gbb5qEzsF7sIU8uhMTsjsdGP4nUX0V+v0R+V7k9Ba3wCqbWWBJrjGLV/88u 1+/Ue0X0rvdYB9OfQ4sqU8WAK+UFuRJeF6CFJ3i6uxDerYBMtuQKsj5pD6/QyrA9bTkk RPEjE1nDmCdvfFUKPNa6B3/45oRH36MF5GvcWMw4hhNg9IIFc+xoQ857nNgk9FpOcsNo YPvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=HH+WNDB7mi6967CYBqXdSGIdnXMS88TpDftB0RX7fM8=; b=KSVcTMhZe7YYNO3TMYYu62Js531E8cSCQ+nu6BfsBL7nKrTZVjegt/vpjmXlK4cKlW vQOuIk8D1OGrObEeQHIFSqlamZM6aA1WuR2lEiJE4JojWFtqNpZQ9T4ZtLcVhYtz5Pn4 wrGHU0ZpeMZODEDAfbNqGbIbur96uNGE5kVK7n9LFkz+za+ksqa7bsWJ2bNK6mvlLHIE 4/jZ2jqBmaCLA4Zc/WKIR2YWHyea/pJE2cH1Zf/GB/BNuteWfXVREIDwv5yO7kQyppUZ +PnlO17iFvh5RRVoyb5x7JAUOhrj9xupcEcsi/RQny4Ki7RZTDUgSLk3ypVDWpDhAPpj gW1Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z143si27821199pfc.38.2019.05.22.06.23.52; Wed, 22 May 2019 06:23:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729469AbfEVNXv (ORCPT + 14 others); Wed, 22 May 2019 09:23:51 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:50556 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728912AbfEVNXv (ORCPT ); Wed, 22 May 2019 09:23:51 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1AED080D; Wed, 22 May 2019 06:23:51 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id CE43F3F575; Wed, 22 May 2019 06:23:46 -0700 (PDT) From: Mark Rutland To: linux-kernel@vger.kernel.org, peterz@infradead.org, will.deacon@arm.com Cc: aou@eecs.berkeley.edu, arnd@arndb.de, bp@alien8.de, catalin.marinas@arm.com, davem@davemloft.net, fenghua.yu@intel.com, heiko.carstens@de.ibm.com, herbert@gondor.apana.org.au, ink@jurassic.park.msu.ru, jhogan@kernel.org, linux@armlinux.org.uk, mark.rutland@arm.com, mattst88@gmail.com, mingo@kernel.org, mpe@ellerman.id.au, palmer@sifive.com, paul.burton@mips.com, paulus@samba.org, ralf@linux-mips.org, rth@twiddle.net, stable@vger.kernel.org, tglx@linutronix.de, tony.luck@intel.com, vgupta@synopsys.com Subject: [PATCH 02/18] locking/atomic: s390/pci: prepare for atomic64_read() conversion Date: Wed, 22 May 2019 14:22:34 +0100 Message-Id: <20190522132250.26499-3-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190522132250.26499-1-mark.rutland@arm.com> References: <20190522132250.26499-1-mark.rutland@arm.com> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The return type of atomic64_read() varies by architecture. It may return long (e.g. powerpc), long long (e.g. arm), or s64 (e.g. x86_64). This is somewhat painful, and mandates the use of explicit casts in some cases (e.g. when printing the return value). To ameliorate matters, subsequent patches will make the atomic64 API consistently use s64. As a preparatory step, this patch updates the s390 pci debug code to treat the return value of atomic64_read() as s64, using an explicit cast. This cast will be removed once the s64 conversion is complete. Signed-off-by: Mark Rutland Cc: Heiko Carstens Cc: Peter Zijlstra Cc: Will Deacon --- arch/s390/pci/pci_debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.11.0 diff --git a/arch/s390/pci/pci_debug.c b/arch/s390/pci/pci_debug.c index 6b48ca7760a7..45eccf79e990 100644 --- a/arch/s390/pci/pci_debug.c +++ b/arch/s390/pci/pci_debug.c @@ -74,8 +74,8 @@ static void pci_sw_counter_show(struct seq_file *m) int i; for (i = 0; i < ARRAY_SIZE(pci_sw_names); i++, counter++) - seq_printf(m, "%26s:\t%lu\n", pci_sw_names[i], - atomic64_read(counter)); + seq_printf(m, "%26s:\t%llu\n", pci_sw_names[i], + (s64)atomic64_read(counter)); } static int pci_perf_show(struct seq_file *m, void *v)