From patchwork Mon Jun 18 10:19:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 138887 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3771832lji; Mon, 18 Jun 2018 03:21:41 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJc/NGiaNqpb4HcApeVvO0UNzO/VE+YKKiWOeCoOspYBRasBVgKoR/g3GAQqEZvp0ldShxf X-Received: by 2002:a17:902:784d:: with SMTP id e13-v6mr13155173pln.197.1529317301826; Mon, 18 Jun 2018 03:21:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529317301; cv=none; d=google.com; s=arc-20160816; b=Qsit424tWApHJqTsoGbpMio84zT+DoO3BwkQpgCgzlS0XaLpwikIy/bqHNQA/O336+ 5H9OabR6d5T4BFNp/6mlD2R/hhjrUUZpYgaTgV0nXNwNEt/4NVovLD9Ru96+ZIHyAdHe t8Vjmie2QMGvJnfahwirIc85Sgnn9DIyuKpaVUrNVPPGDRtaeUtaRhq/D0J0WbsUfVJa GUwMPOXRfXkRwov6UK95n/aO6IZK7ABtKTvxQBeCFTCaePUpBHbh/nj/eF733x5+z8mh IGXTDUDwRTEfk6mxRMBAhqhE0xl5pI9ZsgSDScLxhWr812X8f43XDKozv4ChAcKApmXr V/Hg== 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=W1E+cWc/yeDkdWDba2VFkzd4msSJieQlRlK8dJ+yzLE=; b=tC2ZyAjj3MV7WZNY3ii/HbUgoUr+1aHJcuYeCOK2KBom3koBM2uL9qGHyCguAo3Qyt fj8rVGRoowMoXTqjCKrUmPUfUJ1bU+iTqeqgRzklaUttB6B3nt6dubZx12ox/euAVS6P Xu6JcVXxMJnmi/aBf9LUY7h/S4pk3wIjkLjw+AozWwPvew2TWAR6NxFSXMNSvXzrkPgH YJfvXss7nFmayTdFeQKENUm9dHnzRSjEMCcepbhmjHGjJjEp9qoRw5sU9U/K+qMblg5n 6kM0gN+Dm9H2sMpylQQQ0bcQIXEvFLDRn/YIo2FRCbVhBvgb6HyZ2zPFcC8q7DZdDJ7j 5Udg== 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 ay5-v6si14005674plb.459.2018.06.18.03.21.41; Mon, 18 Jun 2018 03:21:41 -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 S935968AbeFRKVk (ORCPT + 30 others); Mon, 18 Jun 2018 06:21:40 -0400 Received: from foss.arm.com ([217.140.101.70]:59494 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937010AbeFRKUA (ORCPT ); Mon, 18 Jun 2018 06:20:00 -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 F118B80D; Mon, 18 Jun 2018 03:19:59 -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 797E93F25D; Mon, 18 Jun 2018 03:19:58 -0700 (PDT) From: Mark Rutland To: linux-kernel@vger.kernel.org, will.deacon@arm.com, peterz@infradead.org, boqun.feng@gmail.com Cc: mingo@kernel.org, Mark Rutland , Palmer Dabbelt , Albert Ou Subject: [PATCHv3 13/18] atomics/riscv: define atomic64_fetch_add_unless() Date: Mon, 18 Jun 2018 11:19:14 +0100 Message-Id: <20180618101919.51973-14-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180618101919.51973-1-mark.rutland@arm.com> References: <20180618101919.51973-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 Acked-by: Peter Zijlstra (Intel) Acked-by Palmer Dabbelt Cc: Boqun Feng 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 /*