From patchwork Fri Feb 21 08:56:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 11395835 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9175A18EC for ; Fri, 21 Feb 2020 08:56:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 70D0C2067D for ; Fri, 21 Feb 2020 08:56:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730697AbgBUI4d (ORCPT ); Fri, 21 Feb 2020 03:56:33 -0500 Received: from s3.sipsolutions.net ([144.76.43.62]:54710 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727859AbgBUI4d (ORCPT ); Fri, 21 Feb 2020 03:56:33 -0500 Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) (envelope-from ) id 1j546q-00EncU-4X; Fri, 21 Feb 2020 09:56:32 +0100 From: Johannes Berg To: backports@vger.kernel.org Cc: Johannes Berg Subject: [PATCH 04/15] backports: add some more atomic functions Date: Fri, 21 Feb 2020 09:56:13 +0100 Message-Id: <20200221095437.a7707d432cb0.Ib3fe021525950f62eba9fbebb67bd6374d4835e3@changeid> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200221085624.6213-1-johannes@sipsolutions.net> References: <20200221085624.6213-1-johannes@sipsolutions.net> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org From: Johannes Berg Some of the new fetch atomics are now required, add them by using the _return ones and changing the value accordingly. Signed-off-by: Johannes Berg --- backport/backport-include/linux/atomic.h | 32 ++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/backport/backport-include/linux/atomic.h b/backport/backport-include/linux/atomic.h index 9ceb586e864a..6669831ca8a9 100644 --- a/backport/backport-include/linux/atomic.h +++ b/backport/backport-include/linux/atomic.h @@ -60,4 +60,36 @@ static inline int atomic_fetch_add_unless(atomic_t *v, int a, int u) #endif #endif +#ifndef __atomic_pre_full_fence +#define __atomic_pre_full_fence smp_mb__before_atomic +#endif + +#ifndef __atomic_post_full_fence +#define __atomic_post_full_fence smp_mb__after_atomic +#endif + +#if LINUX_VERSION_IS_LESS(4,8,0) +static inline int +atomic_fetch_add(int i, atomic_t *v) +{ + return atomic_add_return(i, v) - i; +} + +static inline int +atomic_fetch_sub(int i, atomic_t *v) +{ + return atomic_sub_return(i, v) + i; +} +#endif + +#ifndef atomic_fetch_add_relaxed +#define atomic_fetch_add_relaxed atomic_fetch_add +#endif + +#ifndef atomic_fetch_sub_relaxed +#define atomic_fetch_sub_acquire atomic_fetch_sub +#define atomic_fetch_sub_release atomic_fetch_sub +#define atomic_fetch_sub_relaxed atomic_fetch_sub +#endif + #endif /* __BP_ATOMIC_H */