From nobody Fri Feb 04 12:01:44 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 D8344198CAAF; Fri, 4 Feb 2022 12:01:44 +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 4JqvK45ls4z4ZkB; Fri, 4 Feb 2022 12:01:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643976104; 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=r07+zZLpAvHpRJ6BFM1iiCSQUGlihlBEAlKmr6+r4vk=; b=Lig0V6F+/g8d6EA3c4rfumB4rCvMe9ZzI4bmRfkKcpUrcn7i18xpo81wbBi9wncmFi+EN/ 3vA1Vzvtt9Pz6t9GTxrauoQcC7xOphx3PTkomGgDxsXvCoVn1Dj8ePkRx2GKxJdniXah5t llGOustIZHWdFeIzdffcl0oVruRVhwpdurQ4TOnUCnOCYnl51qFGkDBB4vzWc8EO9iXU2X /RYMVyygRk0dsEdB8JldokckOnRjMUMLAkV3Dwcs1EJsMmduLzO5pkgEpXRvJpSQWlZRHu LRPYxEJVk0o9RdhO5oB3V9lCdBAfetNO3XTrMLshr/aXTtaGCCGQP5EBq0VALA== 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 A60502F35; Fri, 4 Feb 2022 12:01:44 +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 214C1iwX060779; Fri, 4 Feb 2022 12:01:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 214C1iCI060778; Fri, 4 Feb 2022 12:01:44 GMT (envelope-from git) Date: Fri, 4 Feb 2022 12:01:44 GMT Message-Id: <202202041201.214C1iCI060778@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cbf999e75d61 - main - x86 atomic.h: cleanup comments for preprocessor directives 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbf999e75d61c6efadeed8d32212eefa4dfb3dcb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643976104; 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=r07+zZLpAvHpRJ6BFM1iiCSQUGlihlBEAlKmr6+r4vk=; b=w+IfSQPeg81qeCtAgYYN25AhvFXzuRpCSgksUSdksKUacoaYxjEl32dGLjF5zmeC8twCY8 zvGfBv13lTSol6UKq2wAJ+a7/hVO9vsZFD0H44qhlvQzGGpJ9tFkEroRf2PK20QOYry3sB d16y5Ic19yabKjKG4vslK5xZ81sxGkVv7cVTERN+lHsa9AoHY6/bKaBc2r+hWW3ALVJ1jX jOjzkXJJ9FVu1tuIM/P9UqUuYeFpsIOeoCY/QJ5kf7Y9Vq3mvqYczETQ4QD8FIyRY7ZGjW y1MvcTeD1gECQo9keiL2wnHcpb7JRbHMNpI1LKO9i5pXs21za2VdNy0eYZ0wQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643976104; a=rsa-sha256; cv=none; b=xNJOxZ95SwWgkJT4hD8WWZAadnj7SsbTxNpcTrxDQwBn2KFdNl6J5VU/8ROBXYwBj5DPt9 4DQdqV3EjtEkny5+Yp1iQsZ4u23BJKtAYWiXKLTL0ILdu2KuiX7P+M6tbSEVKtxZYfVMvj ZgXznAdal3QGU/4pH9oi2xYWHtiMuyTwAwQ3tw9fXOeVhpx/taFQXRi4fubjqNlpN/y9uq d2zn6k1CPuW34G3tcqflrwXdV4VT80xVTPUQ9KHaMjns1ertlAKWPn1952bi1xAKDPVSeO thW7NbBwopSPpCzYORUJewoQ89gTEHaBKNE1fXqYyjkyKpi5K/xaJpkMbezopg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cbf999e75d61c6efadeed8d32212eefa4dfb3dcb commit cbf999e75d61c6efadeed8d32212eefa4dfb3dcb Author: Konstantin Belousov AuthorDate: 2022-02-03 09:25:03 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-04 12:01:39 +0000 x86 atomic.h: cleanup comments for preprocessor directives Reviewed by: Elliott Mitchell, imp, jhb, markj, royger Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D34153 --- 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 4a9095ca831b..ed80c426add2 100644 --- a/sys/amd64/include/atomic.h +++ b/sys/amd64/include/atomic.h @@ -140,7 +140,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 @@ -428,7 +428,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);