From nobody Tue Oct 18 14:03:26 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MsFvL58yyz4ftLM; Tue, 18 Oct 2022 14:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MsFvL4cM1z3Ffb; Tue, 18 Oct 2022 14:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666101806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RRtU+PxYc459VhyzNdHnCKY/PJWrC7gHptYyADwnuv4=; b=BSnIyXRoXKntOSCVVSBiugeR9M6WoDqReEjDbIaWwsJ90DkOqP+ew3Or30uFg42IwdL7uX tnbiP2z9/N0RxO500hUs1N7Pne4aGSRgputYU3+GhH2b2EFveeMeMOELJculqrEVjYv+hE LITo97h4+1Un8I8R0ugG7mTSgInch4DFS60cRXGGyPxzKH5t5U86RmlNV7vJZZl653ubT/ g9CSs9KRYO0dj/WW963OZobN5X6yioiLZ78sq/KvZc3bG16XTEFRpit8lG8RNNwt11W0rN DReGEsF92002V5HsmD3bBNCGsM69+WgBBH937jRLv+PfDFFeH6x9XDnaT0DwvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MsFvL3dnPz1BX6; Tue, 18 Oct 2022 14:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29IE3Qep092356; Tue, 18 Oct 2022 14:03:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29IE3Q5B092355; Tue, 18 Oct 2022 14:03:26 GMT (envelope-from git) Date: Tue, 18 Oct 2022 14:03:26 GMT Message-Id: <202210181403.29IE3Q5B092355@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 20c301a76133 - stable/13 - atomic: Style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 20c301a761330c96d95ce46fd365d2ae7973b00e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666101806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RRtU+PxYc459VhyzNdHnCKY/PJWrC7gHptYyADwnuv4=; b=hCTxj8xEGyO0hINFMYhJm8gUdtbDQLCW83MNMUvkujyXQTzY0ZXBbw82tDISDUPji3jLkH mL1g2IL4/1RJXRcOQTY3m6rwevqTTI1/WIK3f5holdSHn7wY1yytn1Nz8sUf1NJvw72cA+ I7JFFPILktcIzh2PKy9H7vtgw8PaS4euNV4wU7k4PT2nbNVqDNPM7lcYyS9g3NMi9+HTVf gaS1cb1NxYuU5KQXaFoGMEfK5Yrfhzyo052kCt75qex+JtC6v+z+NdFqXVihiG+LmZHaC5 pvXqyv9+1QWqR3GeIJVWmlvvZ5BLdK7bKwh078tD3KgbfOHXY/H3D6reT1SPsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666101806; a=rsa-sha256; cv=none; b=nZjDKtk1hk9yjr5FKETFuH1W0LrX4j4pCIN3mpKFCoLW7NBXa+5x19CUu5NyrQrUa5OyFk cJ2ln2O06CPQH6xyuFOgoZu4pQBpPIWALi40awjapyv+1WJ+Mp8PuifguOzQ3aQt9rdFdO fPsPopHwcEpJjsziNBauVS5zGOqbvR9FbkHjvECBaScduCI/nNmI4o2G9YoLniZIJB7DJ3 L40k65R8g51jsu6WI15Bh7N9EYPcipmij8yUjpA+mc/1yzUdjWhfJRO93+kUO6ADpKCYUB cnuxrUzo86dFnRwb0Fcj5bhwgUtytWTFh/Ds+SAc8fSnmweyLhzk4m1LRAF2ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=20c301a761330c96d95ce46fd365d2ae7973b00e commit 20c301a761330c96d95ce46fd365d2ae7973b00e Author: Mark Johnston AuthorDate: 2022-10-11 14:54:36 +0000 Commit: Mark Johnston CommitDate: 2022-10-18 13:51:29 +0000 atomic: Style Fixes: 30253da1a982 ("atomic: Add some type checking to plain atomic_load/store helpers") (cherry picked from commit 301a27dc65463fc9a909835863ff5566623f6ef2) --- sys/sys/atomic_common.h | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/sys/atomic_common.h b/sys/sys/atomic_common.h index 04281ae8f2ed..a7b0b50512dc 100644 --- a/sys/sys/atomic_common.h +++ b/sys/sys/atomic_common.h @@ -81,15 +81,21 @@ #define __atomic_load_generic(p, t, ut, n) \ _Generic(*(p), \ - t: __atomic_load_ ## n ## _relaxed(p), ut: __atomic_load_ ## n ## _relaxed(p)) + t: __atomic_load_ ## n ## _relaxed(p), \ + ut: __atomic_load_ ## n ## _relaxed(p)) #define __atomic_store_generic(p, v, t, ut, n) \ _Generic(*(p), \ - t: __atomic_store_ ## n ## _relaxed(p, v), ut: __atomic_store_ ## n ## _relaxed(p, v)) + t: __atomic_store_ ## n ## _relaxed(p, v), \ + ut: __atomic_store_ ## n ## _relaxed(p, v)) #else -#define atomic_load_bool(p) __atomic_load_bool_relaxed(p) -#define atomic_store_bool(p, v) __atomic_store_bool_relaxed(p, v) -#define __atomic_load_generic(p, t, ut, n) __atomic_load_ ## n ## _relaxed(p) -#define __atomic_store_generic(p, v, t, ut, n) __atomic_store_ ## n ## _relaxed(p, v) +#define atomic_load_bool(p) \ + __atomic_load_bool_relaxed(p) +#define atomic_store_bool(p, v) \ + __atomic_store_bool_relaxed(p, v) +#define __atomic_load_generic(p, t, ut, n) \ + __atomic_load_ ## n ## _relaxed(p) +#define __atomic_store_generic(p, v, t, ut, n) \ + __atomic_store_ ## n ## _relaxed(p, v) #endif #define atomic_load_char(p) __atomic_load_generic(p, char, u_char, char) @@ -134,4 +140,4 @@ #define atomic_interrupt_fence() __compiler_membar() -#endif +#endif /* !_SYS_ATOMIC_COMMON_H_ */