From nobody Fri Jan 17 12:27:22 2025 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 4YZJs753h0z5kvtT; Fri, 17 Jan 2025 12:27:23 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YZJs72K47z3V05; Fri, 17 Jan 2025 12:27:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737116843; 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=cj9EoUbbhoAb6Nei5muqCemTbRmIGlFZZwyaCB+o5wc=; b=m0ACOraRFCcsJM/bIkRNQfl298uoohTKX6tvHm55fLZQwrJ2jEsMaqdauz3WF64SAxGjp0 xGjcNHLCh/HLbCkpG6aSkY0IqGmsRL2DbkV7/mqDYSjdKat/gY8T8OQl2KLzc4uj/XZp6j oJ3X6ETJrOeAwUWLOBKNXZoc3KXoW5gVxwjocxle9beMq3nVLNBOSyJCjEaq0HF1L29iX2 Q6LVppexZMecO0KY2RbfiUt0Bus+bvUB40MjfOrnW36kplYPxUujrV+Ir4XjACHbC3G+Ht uh6eS6Ba8UxK6qu2gFIVx5H0HWOBQNztbtuVV8PO6p48aa/PESHRMD1aRhWXCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737116843; 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=cj9EoUbbhoAb6Nei5muqCemTbRmIGlFZZwyaCB+o5wc=; b=koBsiLfkVzv71y6noJl4/i8OtSk0WRkhbVei6akAks960t6SZPWSs+D4Ugc+RKU4KLmVsq v+4WcddlFdlKXdYhbeh4W9HXy4BIJI0j9lK4NJgKWDtz8mAAWs+g4onFqDBjN4Yvlb/kqN vtGT4Vwiwtz2OTq0ejhONYJZUqgvhtkJwXR2DQXZZM8modZmkcjqRUHyFxMdka8SxnUIaH HIqcbNK3Y3ac/jEDqFVFOWcfhFGSfwje2kaek4o1nDazgYYtqCDNYOuZBoUrSlEl1auhnu 94joaFrJdPvU89OQGe1pVsdEvtGZEMtAPKfrNhClrBv4Zidmwt9C04jWKh/dcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737116843; a=rsa-sha256; cv=none; b=iEG3Yf8Qd/v4FprHfIuyox47W5YfgtnFwFq8qPVnCAOqWGaVnIUoDAK3Hl5064hiMfDFAd AWEZ/gM9bu1gec6O15FXx/HYwkA0OBMeRaEq7ib1oQZeQgqGqrwvYNv9Y6+U4GXfhm/x+d hO/4gUpdfEqgEXGPyopPTobWYiCCEdbBaCByVxqHef7U3pCo4dRtQwBGMaadYhVJ6nKwWn fXKX309b0xRVl31KOJoCMlAeVAA9WfMDwlIcvFZBNqjI5MhVIbG/WtSig7IMLSgk+fhVG6 GeKZYUiIuq9hRyDIL0/w/xxqAQCBQpPl34uuiAVwZMoUOplsyjJ3xyd5C1IAcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YZJs66RWlz35h; Fri, 17 Jan 2025 12:27:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50HCRMV9052875; Fri, 17 Jan 2025 12:27:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HCRMTB052872; Fri, 17 Jan 2025 12:27:22 GMT (envelope-from git) Date: Fri, 17 Jan 2025 12:27:22 GMT Message-Id: <202501171227.50HCRMTB052872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: b6a3bda9bc2e - stable/13 - x86 atomics: Remove unused WANT_FUNCTIONS 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b6a3bda9bc2eebbc7630ec7a9ccb27ca923ef596 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b6a3bda9bc2eebbc7630ec7a9ccb27ca923ef596 commit b6a3bda9bc2eebbc7630ec7a9ccb27ca923ef596 Author: Olivier Certner AuthorDate: 2024-12-09 16:13:09 +0000 Commit: Olivier Certner CommitDate: 2025-01-17 12:24:53 +0000 x86 atomics: Remove unused WANT_FUNCTIONS This macro has not been in use since commit "inline atomics and allow tied modules to inline locks" (r335873, f4b3640475cec929). Reviewed by: markj, kib, emaste, imp MFC after: 5 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48061 (cherry picked from commit fa368cc86cebe7185b3a99d4f6083033da377eee) --- sys/amd64/include/atomic.h | 3 --- sys/i386/include/atomic.h | 15 --------------- 2 files changed, 18 deletions(-) diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h index c1816ac4fb8b..da4e42cd0763 100644 --- a/sys/amd64/include/atomic.h +++ b/sys/amd64/include/atomic.h @@ -418,7 +418,6 @@ ATOMIC_LOADSTORE(long); #undef ATOMIC_LOAD #undef ATOMIC_STORE #undef ATOMIC_LOADSTORE -#ifndef WANT_FUNCTIONS /* Read the current value and store a new value in the destination. */ #ifdef __GNUCLIKE_ASM @@ -632,8 +631,6 @@ u_long atomic_swap_long(volatile u_long *p, u_long v); #define atomic_swap_ptr atomic_swap_long #define atomic_readandclear_ptr atomic_readandclear_long -#endif /* !WANT_FUNCTIONS */ - #endif /* !SAN_NEEDS_INTERCEPTORS || SAN_RUNTIME */ #endif /* !_MACHINE_ATOMIC_H_ */ diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h index 2ccd206a35ec..d8c7d231cc73 100644 --- a/sys/i386/include/atomic.h +++ b/sys/i386/include/atomic.h @@ -339,17 +339,6 @@ atomic_thread_fence_seq_cst(void) #ifdef _KERNEL -#ifdef WANT_FUNCTIONS -int atomic_cmpset_64_i386(volatile uint64_t *, uint64_t, uint64_t); -int atomic_cmpset_64_i586(volatile uint64_t *, uint64_t, uint64_t); -uint64_t atomic_load_acq_64_i386(const volatile uint64_t *); -uint64_t atomic_load_acq_64_i586(const volatile uint64_t *); -void atomic_store_rel_64_i386(volatile uint64_t *, uint64_t); -void atomic_store_rel_64_i586(volatile uint64_t *, uint64_t); -uint64_t atomic_swap_64_i386(volatile uint64_t *, uint64_t); -uint64_t atomic_swap_64_i586(volatile uint64_t *, uint64_t); -#endif - /* I486 does not support SMP or CMPXCHG8B. */ static __inline int atomic_cmpset_64_i386(volatile uint64_t *dst, uint64_t expect, uint64_t src) @@ -660,8 +649,6 @@ ATOMIC_LOADSTORE(long); #undef ATOMIC_STORE #undef ATOMIC_LOADSTORE -#ifndef WANT_FUNCTIONS - static __inline int atomic_cmpset_long(volatile u_long *dst, u_long expect, u_long src) { @@ -921,8 +908,6 @@ u_long atomic_swap_long(volatile u_long *p, u_long v); #define atomic_readandclear_ptr(p) \ atomic_readandclear_int((volatile u_int *)(p)) -#endif /* !WANT_FUNCTIONS */ - #if defined(_KERNEL) #define mb() __mbk() #define wmb() __mbk()