From nobody Thu Oct 01 19:47:34 2026 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 4hwj9y6rnRz6vbNH for ; Thu, 01 Oct 2026 19:47:34 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hwj9y4NW5z3LqB for ; Thu, 01 Oct 2026 19:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790884054; 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=Cdc0MqqDPY2V/qcHFSno1DLPfxbTAYi8VBf2xalJ8jg=; b=N989OLYHtaKwxTUP/s2zVWkU75VulBzzBiuXAOfjhP1kRy7Rl/EZddIHIETiTWtVO1GUro 5CuzPJ7W/0Pg5YkK8JktRbs+ALKQ/YzZ72E+B8DqGWGUpzc9/mzGLNJ9tlGKkBKlIw6qdV hJg17CzKvKzl6qVhwAKtbHCZWI1nbA14Z+UPKiCsyZPBRO2SO7wysaPuhRP8ATBSsoEN7D 618gGmZcWGtY3wFPU6KGaeWwQQigAeVX4X6gRBQBevH7LM80+5rCofhW+211gk+XBCngKU zgENNUaZrRB0e/X43CHvLKnXjTV5zqZ7g9FJE73lX4DQyopZNAI/AnfD+rK3Tg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790884054; b=a9ZdZ9muyjguQy44S83rCp6kpNc6kUd3Ep2lIh9Sgm/2H32ExU5eNutq5KXEsh1sDAZp+9 1GR/G4VWd+FaXaVbAFOFAJNkdsER0WRUsx1lWrB5kHrP0Ke77Jh8cb+iELyctdShEteOar r6PyA5xHs85op1DQtTCLw9aKaJP+aj/csemzNZe6eO8+6wFWojiR5T1Tapl7dtwRbO8NrQ oD9p5IXT7JRm/CfCEsCY8a3XWo+VFBkqaj0ld72XC4BokcgWaFTJIJmOo2W9ZTrL0SCNa3 JcES8NsDFIyhtoAy9XX/DyjVTLT1YGyeUObxYlBNlPUhMwy1SgMpZ+8f+UePBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790884054; 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=Cdc0MqqDPY2V/qcHFSno1DLPfxbTAYi8VBf2xalJ8jg=; b=GRQdq/oYF6lSeivncN/rqqdcVvvOekpSiSoIUq8cjE/eM9WuiOmWJnPM+iErK1/JfJTD82 vGJuYo0EMXPQrntTWTfolGTS8HjfCw+poGxeTc9dU4VAFRmLc1cS83w3aXXbO0GYw+a6Mj obfZtwQfVbLA5oSbepHBtre2iaVBbM66YIzQe5Y+N1NnW//tojOZIuoEUsbmYNPULz5DBy wqDzyEr3cMTvZyO4dZU+H8Uxpb4neEvN0BibEvVt2/MLNW42qW5Jz4LoA0OmCmfRl4bzC5 SAkuFwoiNgKBIJDCVDouHmvdmGBOqD0ul6RO/yZIoJWklRBJsytOJCNBKxmcKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hwj9y2wKWzmwd for ; Thu, 01 Oct 2026 19:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27992 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Oct 2026 19:47:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: a2fbd988638e - main - ifuncs: Include instead of 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: a2fbd988638e94b61cc78449e893f2c02d43dec0 Auto-Submitted: auto-generated Date: Thu, 01 Oct 2026 19:47:34 +0000 Message-Id: <6abeb8d6.27992.319bf333@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a2fbd988638e94b61cc78449e893f2c02d43dec0 commit a2fbd988638e94b61cc78449e893f2c02d43dec0 Author: Olivier Certner AuthorDate: 2026-09-30 13:01:46 +0000 Commit: Olivier Certner CommitDate: 2026-10-01 19:46:53 +0000 ifuncs: Include instead of All architectures have been providing an 'ifunc.h' header with DEFINE_IFUNC() et alter working both in kernel and userland since commit cf41d1113377 ("riscv: implement kernel ifunc resolution"), and separate and headers were introduced in commit 2b1db07bec92 ("x86: add machine/ifunc.h"), so stop including directly and use the common idiom. While here, re-order includes in the blocks featuring , which requires fixing so that it can be included before . Reviewed by: kib MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D60194 --- sys/amd64/amd64/copyout.c | 2 +- sys/amd64/amd64/fpu.c | 4 ++-- sys/amd64/amd64/machdep.c | 10 +++++----- sys/amd64/amd64/pmap.c | 8 ++++---- sys/amd64/linux/linux_machdep.c | 2 +- sys/amd64/linux32/linux32_machdep.c | 2 +- sys/amd64/vmm/vmm.c | 8 ++++---- sys/cddl/dev/dtrace/amd64/dtrace_isa.c | 2 +- sys/i386/i386/npx.c | 4 ++-- sys/i386/i386/pmap.c | 2 +- sys/i386/i386/pmap_base.c | 2 +- sys/libkern/gsb_crc32.c | 2 +- sys/x86/include/apicvar.h | 3 +++ sys/x86/x86/cpu_machdep.c | 4 ++-- 14 files changed, 29 insertions(+), 26 deletions(-) diff --git a/sys/amd64/amd64/copyout.c b/sys/amd64/amd64/copyout.c index 7e07cb810c4e..e042c0b18654 100644 --- a/sys/amd64/amd64/copyout.c +++ b/sys/amd64/amd64/copyout.c @@ -36,9 +36,9 @@ #include #include +#include #include #include -#include int fubyte_nosmap(volatile const void *base); int fubyte_smap(volatile const void *base); diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 11f9c5b98134..1a63aaf7d4cc 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -51,15 +51,15 @@ #include #include +#include #include #include #include #include #include -#include #include +#include #include -#include /* * Floating point support. diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 099bc7163bde..b5a06efd37e6 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -115,7 +115,11 @@ #include #include #include +#ifdef FDT +#include +#endif #include +#include #include #include #include @@ -124,15 +128,11 @@ #include #include #include +#include #include #include #include #include -#include -#include -#ifdef FDT -#include -#endif #ifdef DEV_ATPIC #include diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 74c1fc0d755e..12c17a8ced64 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -153,17 +153,17 @@ #include #include -#include -#include #include -#include +#include #include #include +#include +#include #include #include #include -#include #include +#include #include #include diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c index e05f824cbea1..dc7f55f6f198 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -40,6 +40,7 @@ #include #include +#include #include #include #include @@ -48,7 +49,6 @@ #include #include -#include #include #include diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index 7f1c85cee201..a9517b42a4d9 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -38,9 +38,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index cea8ee99609d..fe31e76d600c 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -56,13 +56,13 @@ #include #include +#include #include -#include -#include +#include #include +#include #include -#include -#include +#include #include #include diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_isa.c b/sys/cddl/dev/dtrace/amd64/dtrace_isa.c index f14e90d974bc..a46acaf9e5f2 100644 --- a/sys/cddl/dev/dtrace/amd64/dtrace_isa.c +++ b/sys/cddl/dev/dtrace/amd64/dtrace_isa.c @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include diff --git a/sys/i386/i386/npx.c b/sys/i386/i386/npx.c index a81413c291b3..bd8a2fb8a004 100644 --- a/sys/i386/i386/npx.c +++ b/sys/i386/i386/npx.c @@ -56,14 +56,14 @@ #include #include #include +#include #include #include #include #include -#include #include +#include #include -#include #include diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index efaaf103ab29..3ca917d001dc 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -145,10 +145,10 @@ #include #include #endif -#include #include #include #include +#include #include #include #include diff --git a/sys/i386/i386/pmap_base.c b/sys/i386/i386/pmap_base.c index 7a45279775cd..7a1aa03320be 100644 --- a/sys/i386/i386/pmap_base.c +++ b/sys/i386/i386/pmap_base.c @@ -95,13 +95,13 @@ #include #include #include +#include #include #ifdef DEV_APIC #include #include #include #endif -#include static SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "VM/pmap parameters"); diff --git a/sys/libkern/gsb_crc32.c b/sys/libkern/gsb_crc32.c index ab8c13d3023c..d1af6af0d01c 100644 --- a/sys/libkern/gsb_crc32.c +++ b/sys/libkern/gsb_crc32.c @@ -52,7 +52,7 @@ #if defined(__amd64__) || defined(__i386__) #include #include -#include +#include #endif #if defined(__aarch64__) diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index a6116591eb83..1231b8563ab3 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -28,6 +28,9 @@ #ifndef _X86_APICVAR_H_ #define _X86_APICVAR_H_ +/* For inthand_t. */ +#include + /* * Local && I/O APIC variable definitions. */ diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 422bdf9cfb0d..274c2854b27d 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -74,8 +74,9 @@ #include #include #include -#include +#include #include +#include #include #include #ifdef SMP @@ -85,7 +86,6 @@ #include #endif #include -#include #include #include