From patchwork Thu May 8 21:13:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 4138901 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 394F1BFF02 for ; Thu, 8 May 2014 21:16:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4C1C4202E5 for ; Thu, 8 May 2014 21:16:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 546F0202DD for ; Thu, 8 May 2014 21:16:28 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WiVdm-0000ew-Ou; Thu, 08 May 2014 21:14:06 +0000 Received: from mail-ig0-x22d.google.com ([2607:f8b0:4001:c05::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WiVdk-0000cU-Md for linux-arm-kernel@lists.infradead.org; Thu, 08 May 2014 21:14:05 +0000 Received: by mail-ig0-f173.google.com with SMTP id hn18so340987igb.0 for ; Thu, 08 May 2014 14:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding; bh=dqv9SsqYYRrfDkpTe20q2nvsOH37aTBRO5S0ld1MvjI=; b=IksQJKoyGPcz6BmYqKa97TbCRSi41VpPFVqW70JUrmH0IPcmg+gnkvFVdyUuPy7Bge BD6wykDwcnOUbDNizk/PFdp/3WQpMBHplzO6pQ6VG7yWS7X67EyF8NFQFfApZChemWLb IySpB5jlZ5E7+0BntB77ftXKQ35n/NbcZM8+hOvkUL8IIsOhOCtfgUI+PF3mxw5t4AtH xFH73jRTBdWxsxOQbxtxsERRDPHf3xTm3cu1X0kMNEQvDGUYF8/B7O64UCYJgx2w5enP FmJKecVZERdgNdQfnqrf3Zts7nL6W+Qbk5Qh8gtNdhktwiEG+xgPXJjI9/E2Jjp3oih7 6DMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:user-agent :mime-version:content-type:content-transfer-encoding; bh=dqv9SsqYYRrfDkpTe20q2nvsOH37aTBRO5S0ld1MvjI=; b=mITQk9JNAUmY9stFfky19tPtZeiMdiIL4SPVbU4HBqPIoovHC3hN3WcrwKm0mOacRK 6agkSe6z+P7SWF7pvZBg8sUC/SZbTkGjvdBmqodLGeCDGdJxyW3FJmXKJt1AZTqqMkH0 WnYn0Hvtl0UI0sErYGU6Gwuarz9iCN4v6XhWLoWAU3Yhxnl9OL1jS1B52WWkqiWRwLJF fE/0GpPRYXeP9M5WlS8xs4ARV8JRvpkCjZG8TCGdW7ljh/kZpR0XJoEQW8XLnXtytg70 zhmWykQklYDOz4//T3rQYrIrrjNY4At0u4UBj2DPAxB/FAbgskQ3puDXklC9Tiaog5fB MXPQ== X-Gm-Message-State: ALoCoQmrLQQsOaDIzyfp0CsUcz+CpwQnOSg6SNfqmdk8CHUR2Nb4y+bSu7g+uCEO1sHo7U39kE1B X-Received: by 10.50.4.70 with SMTP id i6mr311347igi.40.1399583623601; Thu, 08 May 2014 14:13:43 -0700 (PDT) Received: from localhost ([172.16.48.245]) by mx.google.com with ESMTPSA id mu2sm1507692igb.21.2014.05.08.14.13.43 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 08 May 2014 14:13:43 -0700 (PDT) Subject: [PATCH] arm64: Make atomic64_t() return "long", not "long long" To: Catalin Marinas , Will Deacon From: Bjorn Helgaas Date: Thu, 08 May 2014 15:13:47 -0600 Message-ID: <20140508211347.18358.8154.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140508_141404_779207_2ECF95A8 X-CRM114-Status: GOOD ( 10.65 ) X-Spam-Score: -0.8 (/) Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP arm64 sets CONFIG_64BIT=y and hence uses the "long counter" atomic64_t definition from include/linux/types.h. Make atomic64_read() return "long", not "long long". Signed-off-by: Bjorn Helgaas --- arch/arm64/include/asm/atomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/atomic.h b/arch/arm64/include/asm/atomic.h index 0237f0867e37..9c48d74652cb 100644 --- a/arch/arm64/include/asm/atomic.h +++ b/arch/arm64/include/asm/atomic.h @@ -162,7 +162,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u) */ #define ATOMIC64_INIT(i) { (i) } -#define atomic64_read(v) (*(volatile long long *)&(v)->counter) +#define atomic64_read(v) (*(volatile long *)&(v)->counter) #define atomic64_set(v,i) (((v)->counter) = (i)) static inline void atomic64_add(u64 i, atomic64_t *v)