From patchwork Fri Feb 14 10:51:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 11382087 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 A6B4C109A for ; Fri, 14 Feb 2020 10:51:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 87874217F4 for ; Fri, 14 Feb 2020 10:51:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729125AbgBNKvw (ORCPT ); Fri, 14 Feb 2020 05:51:52 -0500 Received: from s3.sipsolutions.net ([144.76.43.62]:42486 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729098AbgBNKvw (ORCPT ); Fri, 14 Feb 2020 05:51:52 -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 1j2YZZ-00BQiv-Ep; Fri, 14 Feb 2020 11:51:49 +0100 From: Johannes Berg To: backports@vger.kernel.org Cc: Johannes Berg Subject: [PATCH] backports: add some more atomic functions Date: Fri, 14 Feb 2020 11:51:37 +0100 Message-Id: <20200214115137.5219058d5372.Ib3fe021525950f62eba9fbebb67bd6374d4835e3@changeid> X-Mailer: git-send-email 2.24.1 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 | 36 ++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/backport/backport-include/linux/atomic.h b/backport/backport-include/linux/atomic.h index 9ceb586e864a..2b4d035ce9eb 100644 --- a/backport/backport-include/linux/atomic.h +++ b/backport/backport-include/linux/atomic.h @@ -60,4 +60,40 @@ 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 + +#ifndef atomic_fetch_add +static inline int +atomic_fetch_add(int i, atomic_t *v) +{ + return atomic_add_return(i, v) - i; +} +#define atomic_fetch_add atomic_fetch_add +#endif + +#ifndef atomic_fetch_add_relaxed +#define atomic_fetch_add_relaxed atomic_fetch_add +#endif + +#ifndef atomic_fetch_sub +static inline int +atomic_fetch_sub(int i, atomic_t *v) +{ + return atomic_sub_return(i, v) + i; +} +#define atomic_fetch_sub atomic_fetch_sub +#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 */