From nobody Sun Jul 09 17:51:54 2023 X-Original-To: dev-commits-src-main@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 4QzZT62vRZz4mVdG; Sun, 9 Jul 2023 17:51:54 +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 4QzZT627NZz3stD; Sun, 9 Jul 2023 17:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925114; 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=S/X4uae3QFHN+pEFepqGeudkVNcP/6zqBFu6L8kfZjI=; b=qDA8kd+4eIgBvoA/0yqX0FJ1hOzoHx83inlTGKu9bwTMz/eGFPulK/v8MFwfKDN6UhAwLH xSZTKs2wQ0tvfCVXmNNsdwevbaP1z2WVpw8mc0njqR9MGWQK006fw9JN6DaXRf3et88WD/ 3oBrZQZ2P/ZmMlCVnZAQhFPKHXJAnIEslWQGupDYmUMS1YXVEEd6bG9psxiKL1SL+4jydR ADBOLvbLbZgTPpuHmAFrsdkWe5ZMBuwSm2LEr/XSRrIIoF+P/+uwIPSzmi6I43baPn0hSz XG0rBDoe1Ng5bKZvT2krakxdDOTRkWlaqF+9sGFqkg3L7m2TpaimA/68l7mVUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925114; 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=S/X4uae3QFHN+pEFepqGeudkVNcP/6zqBFu6L8kfZjI=; b=FJIe0un13pje9RjXr6E3avxS+yENtN1YlcuhWW6iqkIByCZHtGDqF9hXxfS/F0fwAjn9S2 7WPnQm6D4O6Kx7Wh1rLbNLv6sAlUeMeAcBb3m7VabpbeKpFD4tregdwvZInIx3ThoWItRy lm4NL4LTZtADxM7v2UGRc+8WhOvTLCqeMhO1WjdHkjR2jqG0ChJXBleiRS47+wohPbUiHI 76GN6afGjrjQboLKGzbcwsDhWgnPa973KBCCwa+Y6cVovqd2x2b68ojo1yM3ZuGRDsDoHR OPHVL1EarKAhwj2dOusIJc2aidPfcJOGfVP1k5Ea5SUOX211hgKUu+VBUqDG9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925114; a=rsa-sha256; cv=none; b=I4Mr6igmWP4KOOqBRnExBps4Wi23pzSuQeArrFMCQLfq6AYdKE56tWLgrtEZMenpudh2dM GJ9ADfyld/tc+sf/xeO3/hpCe8ghVcbLj3pbx45/Bon5B7m25yyxKzMqH3qhiqeYwvTQlc IBXkzwCTAM2SciiGUb+a5GpkLuuEFCzoPps/GLxgThplwDI2+QI1ihgcpDYjYVN83MAR+0 8/aRgrpkrcUrEDbZT15Ww54rPFfF9uBc14x9rA/AENuYNf9N5oMTnlo5nNqdvEyPson41D sCiMuZbJY2hIXdQI7HvH7ueSMzdA0ZnsvMQWjBBhsszxdZn8dFuUu5pqj81GKQ== 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 4QzZT619l7z1Bcm; Sun, 9 Jul 2023 17:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369HpsFL096346; Sun, 9 Jul 2023 17:51:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369HpsG4096345; Sun, 9 Jul 2023 17:51:54 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:51:54 GMT Message-Id: <202307091751.369HpsG4096345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: c63c4e694cfb - main - Don't bother to check COMPAT_32BIT when __LP64__ is defined List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c63c4e694cfb0a2cba46b91869f7630e2afd80ae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=c63c4e694cfb0a2cba46b91869f7630e2afd80ae commit c63c4e694cfb0a2cba46b91869f7630e2afd80ae Author: Jessica Clarke AuthorDate: 2023-07-09 17:45:32 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:45:32 +0000 Don't bother to check COMPAT_32BIT when __LP64__ is defined Under COMPAT_32BIT we are compiling 32-bit code and so __LP64__ is not defined, __ILP32__ is, and thus the check is completely redundant. Reviewed by: brooks, jhb, imp Differential Revision: https://reviews.freebsd.org/D40917 --- sys/cddl/compat/opensolaris/sys/atomic.h | 4 ++-- sys/contrib/openzfs/include/os/freebsd/spl/sys/atomic.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/cddl/compat/opensolaris/sys/atomic.h b/sys/cddl/compat/opensolaris/sys/atomic.h index 674ca5b1ff24..68929f701a24 100644 --- a/sys/cddl/compat/opensolaris/sys/atomic.h +++ b/sys/cddl/compat/opensolaris/sys/atomic.h @@ -157,7 +157,7 @@ atomic_dec_64_nv(volatile uint64_t *target) return (atomic_add_64_nv(target, -1)); } -#if !defined(COMPAT_32BIT) && defined(__LP64__) +#ifdef __LP64__ static __inline void * atomic_cas_ptr(volatile void *target, void *cmp, void *newval) { @@ -171,6 +171,6 @@ atomic_cas_ptr(volatile void *target, void *cmp, void *newval) return ((void *)atomic_cas_32((volatile uint32_t *)target, (uint32_t)cmp, (uint32_t)newval)); } -#endif /* !defined(COMPAT_32BIT) && defined(__LP64__) */ +#endif /* __LP64__ */ #endif /* !_OPENSOLARIS_SYS_ATOMIC_H_ */ diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/atomic.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/atomic.h index ccbf6d3293c4..40a67704fde0 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/atomic.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/atomic.h @@ -167,7 +167,7 @@ atomic_dec_64_nv(volatile uint64_t *target) return (atomic_add_64_nv(target, -1)); } -#if !defined(COMPAT_32BIT) && defined(__LP64__) +#ifdef __LP64__ static __inline void * atomic_cas_ptr(volatile void *target, void *cmp, void *newval) { @@ -181,7 +181,7 @@ atomic_cas_ptr(volatile void *target, void *cmp, void *newval) return ((void *)atomic_cas_32((volatile uint32_t *)target, (uint32_t)cmp, (uint32_t)newval)); } -#endif /* !defined(COMPAT_32BIT) && defined(__LP64__) */ +#endif /* __LP64__ */ #else /* _STANDALONE */ /*