From patchwork Wed May 23 13:35:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 136660 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp908922lji; Wed, 23 May 2018 06:37:48 -0700 (PDT) X-Google-Smtp-Source: AB8JxZppugAf8OaPUtRpC8fijL5PsTidEOo/gARmpgpCD4wB3kLyGLII3IRiGL0V1p8W+aU+xwaq X-Received: by 2002:a63:7807:: with SMTP id t7-v6mr2388470pgc.125.1527082668144; Wed, 23 May 2018 06:37:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527082668; cv=none; d=google.com; s=arc-20160816; b=Z77tsuJKWwiVpqKFUfzAqRkmJyczUV7/LxzC/ajpaGYgjz52m3nSBNzr3c1l1QvhwI JDQp/GKE1KYrofTqH7qQpAN8ngPWgRmdKg3p2xUq+PXyHRUpEJpdQ7oDDHRooK/9/Qk6 0VQeMqHuXaIKKOaQi1q4EPKSz0t5Ts9d6FUAhccoGI6HzwDqobFGauhUGnwit4GC0vNU phcA8o6wYtQc0cQDg4uFgdJ0gXg6+ljTH1oadAa5G26NXeezEobxIFU16T6F8vMKxre5 Lh8zmN+kLyjJdne8o9cL163sINdqjtis9NCvsLSuFdTtBx7oJzlLDvj9GthMR6Pl9ebL yr2g== 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:arc-authentication-results; bh=RC4NlHCes+ap8SqSmXhos2kA5G/DxX6wYknxnLUfjh0=; b=knVNlcZ4pm33g3NuW6hbFkfD9q6TbsWkO+yz2zqi5avvLbeG/5AjQSR3zaRS5QeET8 gD8x5c6oEg1AOCleTXV35heR3o+TkFdhr+72TZKx2E2HKK65M3+TtZxKNSiTaMUoEGUp mHdqERvSvZUZKVCeFhAkdRdih6mfIm0adUoSrdq5pCFT0zkwNi1kXE1y8h77V8U78aSu kwyNt04QGOwFoWUvfQxM+20A6Da2AlGG/K6YaInxQC6q9YoXAf5L9XF00BMNAvzw2XWp iOv4P4pz24VRCERVTcAx9eTxe1aCEmkDZgKA7UZSCwKxkfdv5YcYG8GmkT3rVO5Oi+t0 030g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 w135-v6si18800127pff.340.2018.05.23.06.37.47; Wed, 23 May 2018 06:37:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933239AbeEWNhq (ORCPT + 30 others); Wed, 23 May 2018 09:37:46 -0400 Received: from foss.arm.com ([217.140.101.70]:55432 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933165AbeEWNga (ORCPT ); Wed, 23 May 2018 09:36:30 -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 5BB1A165D; Wed, 23 May 2018 06:36:30 -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 07DDA3F24A; Wed, 23 May 2018 06:36:28 -0700 (PDT) From: Mark Rutland To: linux-kernel@vger.kernel.org Cc: Mark Rutland , Boqun Feng , Peter Zijlstra , Will Deacon , Palmer Dabbelt , Albert Ou Subject: [PATCH 11/13] atomics/riscv: define atomic64_fetch_add_unless() Date: Wed, 23 May 2018 14:35:31 +0100 Message-Id: <20180523133533.1076-12-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180523133533.1076-1-mark.rutland@arm.com> References: <20180523133533.1076-1-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As a step towards unifying the atomic/atomic64/atomic_long APIs, this patch converts the arch/riscv implementation of atomic64_add_unless() into an implementation of atomic64_fetch_add_unless(). A wrapper in will build atomic_add_unless() atop of this, provided it is given a preprocessor definition. No functional change is intended as a result of this patch. Signed-off-by: Mark Rutland Cc: Boqun Feng Cc: Peter Zijlstra Cc: Will Deacon Cc: Palmer Dabbelt Cc: Albert Ou --- arch/riscv/include/asm/atomic.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- 2.11.0 diff --git a/arch/riscv/include/asm/atomic.h b/arch/riscv/include/asm/atomic.h index 5f161daefcd2..d959bbaaad41 100644 --- a/arch/riscv/include/asm/atomic.h +++ b/arch/riscv/include/asm/atomic.h @@ -352,7 +352,7 @@ static __always_inline int atomic_fetch_add_unless(atomic_t *v, int a, int u) #define atomic_fetch_add_unless atomic_fetch_add_unless #ifndef CONFIG_GENERIC_ATOMIC64 -static __always_inline long __atomic64_add_unless(atomic64_t *v, long a, long u) +static __always_inline long atomic64_fetch_add_unless(atomic64_t *v, long a, long u) { long prev, rc; @@ -369,11 +369,7 @@ static __always_inline long __atomic64_add_unless(atomic64_t *v, long a, long u) : "memory"); return prev; } - -static __always_inline int atomic64_add_unless(atomic64_t *v, long a, long u) -{ - return __atomic64_add_unless(v, a, u) != u; -} +#define atomic64_fetch_add_unless atomic64_fetch_add_unless #endif /*