From nobody Fri Feb 11 11:13:52 2022 X-Original-To: dev-commits-src-branches@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 D874A19C6FF6; Fri, 11 Feb 2022 11:13:52 +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 4Jw9wc5nw6z3sP6; Fri, 11 Feb 2022 11:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644578032; 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=kc//mbMrsrt+qm2SMtZDeEqzQyXme5dza0Y0jx+CkIY=; b=p/agFPo3HVAoCMNMD0tYV4CvkMg3Saqz/kWBQ6AS5p3so3v/UEJSemjia135jQWYP6bcMx 80J82PF4CYaULFkVzaPx7zA54ZERvELn/EjgKb/ES/mSLsCfcpFJx5JLX6bPa+sB9+S9Xb V8+gJWDsHMm72cjMJCIO/9i7QABehkJolroLs/f006vgmDRL5N3Fz0O4IoOwsSW4u4QXCO +xNSKnXjA5mNy70tMlEBSLg1F9j0lapRmJG8koDsp6G6Mfv7m74gaTVSggzk189iPxZqNT NPAATR8plW3RsPUzr6zab9aIk140SQmGatfm18htvN5MK3mPH4++9b6zTx6RgA== 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 A81FB12CFC; Fri, 11 Feb 2022 11:13:52 +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 21BBDqEB078468; Fri, 11 Feb 2022 11:13:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21BBDqG0078467; Fri, 11 Feb 2022 11:13:52 GMT (envelope-from git) Date: Fri, 11 Feb 2022 11:13:52 GMT Message-Id: <202202111113.21BBDqG0078467@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 725225a72a2a - stable/13 - x86 atomic.h: cleanup comments for preprocessor directives List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 725225a72a2a859762e8237b8202cc605a1dcac7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644578032; 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=kc//mbMrsrt+qm2SMtZDeEqzQyXme5dza0Y0jx+CkIY=; b=UJ3FyrG8vlBV2fwIukxym76rGQtf9JxFruzEgJyYilyF67tSPukJLOxmjDjXPCQOY8mrSw IwPE3pJiizTIQxNsiKynCbQ/aCx196xqq+Y/bkx4fsMjFf8429V1whpqDQWeu0Sw4J1YZR zxDnWg67jFjAlupP5FCGl7xounAl3pfNWXGZAhfPSKhJeB7kxcYvLS+whjJa+9cH2Rb+fG bnvWchaiT9lXpH7A71nRwMSnbpNkFxxIF2WJSQ5EGoTa9i2y2t/uBsWQt1oOfuvBw9MwFr IJ5fkajTEEmauuwITsBdPqd4hZyvbaJ+s5i/gNEZWGGDTn3h5VePmC2weCPtlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644578032; a=rsa-sha256; cv=none; b=TbxsuCcjKRcECr+7es1V/ODIt21pcxFXfZIRwDVsI3HpAOC6zq5ctTiaH15/PrRr9xQ4oO 9rEWdeZZYoVUn4EvloZfDhH/R7YmtnjKNv0WzLAViZ+vBxhN7rthb4coHYPCRtIMGsFExa GkF5QfoNl6oORWtaeu6iJG7Jb65IQoUtuH8PSP2glUh0FBXWjMmM9ZeE92HiBd0DsQrZif QY7YAwbm+5XCzH55H+4KDY9LsliMmmqsUREauALUtAzb5Y0GAE5neEIsj3S6saZR8OqnGv pF9i00iLiPlqZm5Ci+TYirv0ClJMHJpuQekm6E5rQbVXWuYHcKKtBTDWSN1ZGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=725225a72a2a859762e8237b8202cc605a1dcac7 commit 725225a72a2a859762e8237b8202cc605a1dcac7 Author: Konstantin Belousov AuthorDate: 2022-02-03 09:25:03 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-11 10:52:55 +0000 x86 atomic.h: cleanup comments for preprocessor directives (cherry picked from commit cbf999e75d61c6efadeed8d32212eefa4dfb3dcb) --- sys/amd64/include/atomic.h | 4 ++-- sys/i386/include/atomic.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h index c821e77e5b8b..1436c36daf2a 100644 --- a/sys/amd64/include/atomic.h +++ b/sys/amd64/include/atomic.h @@ -148,7 +148,7 @@ u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p) #define ATOMIC_STORE(TYPE) \ void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v) -#else /* !KLD_MODULE && __GNUCLIKE_ASM */ +#else /* !__GNUCLIKE_ASM */ /* * For userland, always use lock prefixes so that the binaries will run @@ -436,7 +436,7 @@ atomic_thread_fence_seq_cst(void) __storeload_barrier(); } -#endif /* KLD_MODULE || !__GNUCLIKE_ASM */ +#endif /* !__GNUCLIKE_ASM */ ATOMIC_ASM(set, char, "orb %b1,%0", "iq", v); ATOMIC_ASM(clear, char, "andb %b1,%0", "iq", ~v); diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h index 14fa3040341c..c65a7ac83a93 100644 --- a/sys/i386/include/atomic.h +++ b/sys/i386/include/atomic.h @@ -138,7 +138,7 @@ uint64_t atomic_fetchadd_64(volatile uint64_t *, uint64_t); void atomic_add_64(volatile uint64_t *, uint64_t); void atomic_subtract_64(volatile uint64_t *, uint64_t); -#else /* !KLD_MODULE && __GNUCLIKE_ASM */ +#else /* !__GNUCLIKE_ASM */ /* * For userland, always use lock prefixes so that the binaries will run @@ -650,7 +650,7 @@ atomic_subtract_64(volatile uint64_t *p, uint64_t v) #endif /* _KERNEL */ -#endif /* KLD_MODULE || !__GNUCLIKE_ASM */ +#endif /* !__GNUCLIKE_ASM */ ATOMIC_ASM(set, char, "orb %b1,%0", "iq", v); ATOMIC_ASM(clear, char, "andb %b1,%0", "iq", ~v);