From nobody Tue Dec 17 14:48:53 2024 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 4YCKSk1Cq3z5hK1C; Tue, 17 Dec 2024 14:48: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YCKSj5VsPz4rXX; Tue, 17 Dec 2024 14:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734446933; 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=X208F7ntdlqmOIqMuiXAB4EcMclQ8HrBEWLSkIWAQ34=; b=dWB6Z6I749RzvmNsekPjeY7nyZ+KyW5yRVQAMzZj5cz03JfauPZxVrDKjv7hp0gfgJlxPA nCOlg2pKwfgBEuaahZj4/EYfQJTmmXIZor2RopkZpZqlYL9GbnoDdsrPlk5Ux8l+v4kaj3 CIoR6wROAK1bSRHc817TRdXku+BjXIk8YsWdXMEjRA8E06arTKTK1G9h5pkKto+KdR4047 EmDp34JMDgoQSDll87Uhb1+xwn9h2Op9z2ZTPp2s+WeAYJ56zoqoak4Nbj2oN/2SRwmrjg Hu8ocgz4rI2029oFV5TPwtNYRjBXyB6vgvX/rSiqz8KPW5wYdFj+pnRV5z3BcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734446933; 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=X208F7ntdlqmOIqMuiXAB4EcMclQ8HrBEWLSkIWAQ34=; b=TEXNvnwCMLsha3vtMvrWtFIjaRKKizGkccM0i6IfTIIwDO7WGk9T8XttlYnwl8CTb/S+g/ 6bwp1FSQlXJWqZc1E5kl+6jB6AqO0abjSQnSpNvAC9pPzylU763dMjondeExr0tyHHFhH4 WAZx+wKCM+yjN4okEZ+a6Kn0/nTfXKZi6rCPDjjnc060YrAc+AGIJz66vdl5eiymPZC7Hl QPoXSQ/abHN0V6bkyaz1TNbCaP7Kvskj7EKKLnVkZU2veTiuEaTKS/nTin3HEWktUDIiu3 Gka+FGP2NO8EzT5f5PsGUJF5cnYMs2MVtpL349x6+6laVzaz7gdVNoZgJteBDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734446933; a=rsa-sha256; cv=none; b=vDUG2LOIMxhtH+eQWm2eUsW1CyMnR3K+DAMZ5LiXI7aWUx5ZjaL3qlW0HyWK+wpdlRcksl 9178+QLt2RBW2LF8BOP0G732Sou2Av+nMUOsv8A28Uq29BON2z3xMnDzyWoggRTn/F7zGE MUjxR7T6ONTDZDTn4tGuAUNxuNtpCG7eiOlX2mj+Ac1be4NVq9FtA7QGuCJiVf37tc3CLi EFRD4N9RJ0n/9kY2Q3UoyOwfXJsOKBbqkOpBP/XLQNHPxdyMwhzquuVWDhZAudc4s9Qie4 SiT6qySvtW0rPCbNfawjCC1mdsJD+XJsKQ6Wst6+fGe4K6IPFP8rWiSTuXjM0w== 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 4YCKSj53ChzSLS; Tue, 17 Dec 2024 14:48:53 +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 4BHEmrW8047897; Tue, 17 Dec 2024 14:48:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BHEmrEl047894; Tue, 17 Dec 2024 14:48:53 GMT (envelope-from git) Date: Tue, 17 Dec 2024 14:48:53 GMT Message-Id: <202412171448.4BHEmrEl047894@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: fa368cc86ceb - main - x86 atomics: Remove unused WANT_FUNCTIONS 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: fa368cc86cebe7185b3a99d4f6083033da377eee Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=fa368cc86cebe7185b3a99d4f6083033da377eee commit fa368cc86cebe7185b3a99d4f6083033da377eee Author: Olivier Certner AuthorDate: 2024-12-09 16:13:09 +0000 Commit: Olivier Certner CommitDate: 2024-12-17 14:48:22 +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 --- 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 e0801d0880e0..78717a8d6544 100644 --- a/sys/amd64/include/atomic.h +++ b/sys/amd64/include/atomic.h @@ -385,7 +385,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. */ static __inline u_int @@ -592,8 +591,6 @@ atomic_swap_long(volatile u_long *p, u_long v) #define atomic_testandset_ptr atomic_testandset_long #define atomic_testandclear_ptr atomic_testandclear_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 4bb74b7ada01..01eb4476120c 100644 --- a/sys/i386/include/atomic.h +++ b/sys/i386/include/atomic.h @@ -299,17 +299,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) @@ -618,8 +607,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) { @@ -874,8 +861,6 @@ atomic_swap_long(volatile u_long *p, u_long v) #define atomic_testandset_ptr(p, val) \ atomic_testandset_int((volatile u_int *)(p), (val)) -#endif /* !WANT_FUNCTIONS */ - #if defined(_KERNEL) #define mb() __mbk() #define wmb() __mbk()