From nobody Thu Oct 08 12:21:50 2026 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 4j0pyR0jMzz6vZKX for ; Thu, 08 Oct 2026 12:21:51 +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 4j0pyQ5hCBz4MYn for ; Thu, 08 Oct 2026 12:21:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791462110; 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=dfuBj9mnynkDuG1P2yNp8vR5ik2xtR9fhN+bdsveTqM=; b=xatFWLthEbI4WB8q+rBdh8pyspEH/zZLQHWB6zVl4JlBEHGWqj6QcQeYtA2hGvsVnWwNBO k521vFVt926th81wdG2aJbhgIcPHqliePM97L/ZXsqajWsvMWvKpwEw80MOiwpRFHTQr0z UhAdzWs/bQ4nSavUbv4TcMRfJ2Lsm5rSG0PhFxwJKjxeplMcm77Cpxvn3UHft8WhfdwdXI FkPedPWxaf/KirqbolMlnOKBKRuDXxR8ypC6f3cV8oIZ+ApgHqR4z0HHG0dO48Nm9AizFD +2Cez5QINnbgd1XP2qJR/AO3T/pAP7Dt6V/5LhS6boDjNPcqXrhZJXCt+gMavQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791462110; b=MD6l8Uoc/WUaId5HJHD4EK0JjrmyVKWEmyxncbr6x655YycYcj2DZUt/PMfaF42hIaHI44 AGPIPTGi9Jbr3HkrlxGfvODegaDOmWRm1kyP3zlIP633s3D+chw4xjZ5miwIiIY4II+bXX 5C3AfVIfacg72KYwQOPeNkxixJFYz62qEaGgmy1ArO3oqwdzqb1zhNKKKF2chBdkhVBVVa 2/bLvGZbTCuE/ykZoUGk2YoBSOZH64Uzp/iiUWmFGN9YOAyRMBMHa6caVN+4ZOkQ90vh9a zg4sJAgBx99vTSUIDkq1ymvP220OUss9tWIbUTo0Dpij9V566FpfNILbmKr64Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791462110; 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=dfuBj9mnynkDuG1P2yNp8vR5ik2xtR9fhN+bdsveTqM=; b=OV1VEBq9nD3AFsiJtYqe8TDY4tl24HFctLxMSjyFJ0SUsp5B5jaWE/DbonWB24LS2XHm2Y zeMo3tEDHCniPyT+79sMuXp+iDBM+AYpzquImt5I+s0wOvyBCl/f3hhOpoGoQBFdBObBc3 0VKvAL4hzZOryMplYnmsZYvSb32Gn5fFRqkqhLHOuvc+2DxRxmxdbXnEJEkVlq3kjlKsqZ 4K4bjhjHlVNtZx5Z7V9nMp3VkaOw+K9ZgM/JBolfEtS+7UYwdUY3KwB5NbXePsfejr/z76 J4t9QIhlUviqSLfSAZ8HwABAPGEBL5++QGafwsIPnsWOlnaD3ZOGJhBZ70orXQ== 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 4j0pyQ3q0WzfrX for ; Thu, 08 Oct 2026 12:21:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 194eb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 12:21:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 35801aa5ee6d - stable/15 - ifuncs: Include instead of 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 35801aa5ee6d7f0a2840f048b50c8ded7ef970c4 Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 12:21:50 +0000 Message-Id: <6ac78ade.194eb.67c910e1@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=35801aa5ee6d7f0a2840f048b50c8ded7ef970c4 commit 35801aa5ee6d7f0a2840f048b50c8ded7ef970c4 Author: Olivier Certner AuthorDate: 2026-09-30 13:01:46 +0000 Commit: Olivier Certner CommitDate: 2026-10-08 12:20:09 +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 (cherry picked from commit a2fbd988638e94b61cc78449e893f2c02d43dec0) --- 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 038abe929753..4ba137234e96 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -116,7 +116,11 @@ #include #include #include +#ifdef FDT +#include +#endif #include +#include #include #include #include @@ -125,15 +129,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 b3f8c2d60468..4d6eb3e2d152 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 7ec1ec56bb95..84ec36032fd4 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 fd5ac272a441..c93522fd2a1e 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 cdbfd688f110..ba9686dca121 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 3936259dbbc3..a136ad60fb3e 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