Page MenuHomeFreeBSD
Files F174228074

D60194.diff
No OneTemporary
Actions

D60194.diff
View Options

diff --git a/sys/amd64/amd64/copyout.c b/sys/amd64/amd64/copyout.c
--- a/sys/amd64/amd64/copyout.c
+++ b/sys/amd64/amd64/copyout.c
@@ -36,9 +36,9 @@
#include <sys/param.h>
#include <sys/systm.h>
+#include <machine/ifunc.h>
#include <machine/md_var.h>
#include <machine/specialreg.h>
-#include <x86/ifunc.h>
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
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -51,15 +51,15 @@
#include <machine/cputypes.h>
#include <machine/frame.h>
+#include <machine/ifunc.h>
#include <machine/intr_machdep.h>
#include <machine/md_var.h>
#include <machine/pcb.h>
#include <machine/psl.h>
#include <machine/resource.h>
-#include <machine/specialreg.h>
#include <machine/segments.h>
+#include <machine/specialreg.h>
#include <machine/ucontext.h>
-#include <x86/ifunc.h>
/*
* Floating point support.
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -115,7 +115,11 @@
#include <machine/clock.h>
#include <machine/cpu.h>
#include <machine/cputypes.h>
+#ifdef FDT
+#include <x86/fdt.h>
+#endif
#include <machine/frame.h>
+#include <machine/ifunc.h>
#include <machine/intr_machdep.h>
#include <x86/mca.h>
#include <machine/md_var.h>
@@ -124,15 +128,11 @@
#include <machine/pcb.h>
#include <machine/proc.h>
#include <machine/sigframe.h>
+#include <machine/smp.h>
#include <machine/specialreg.h>
#include <machine/trap.h>
#include <machine/tss.h>
#include <x86/ucode.h>
-#include <x86/ifunc.h>
-#include <machine/smp.h>
-#ifdef FDT
-#include <x86/fdt.h>
-#endif
#ifdef DEV_ATPIC
#include <x86/isa/icu.h>
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -153,17 +153,17 @@
#include <vm/vm_dumpset.h>
#include <vm/uma.h>
-#include <machine/asan.h>
-#include <machine/intr_machdep.h>
#include <x86/apicvar.h>
-#include <x86/ifunc.h>
+#include <machine/asan.h>
#include <machine/cpu.h>
#include <machine/cputypes.h>
+#include <machine/ifunc.h>
+#include <machine/intr_machdep.h>
#include <machine/md_var.h>
#include <machine/msan.h>
#include <machine/pcb.h>
-#include <machine/specialreg.h>
#include <machine/smp.h>
+#include <machine/specialreg.h>
#include <machine/sysarch.h>
#include <machine/tss.h>
diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c
--- a/sys/amd64/linux/linux_machdep.c
+++ b/sys/amd64/linux/linux_machdep.c
@@ -40,6 +40,7 @@
#include <sys/ptrace.h>
#include <sys/syscallsubr.h>
+#include <machine/ifunc.h>
#include <machine/md_var.h>
#include <machine/pcb.h>
#include <machine/specialreg.h>
@@ -48,7 +49,6 @@
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <x86/ifunc.h>
#include <x86/reg.h>
#include <x86/sysarch.h>
diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c
--- a/sys/amd64/linux32/linux32_machdep.c
+++ b/sys/amd64/linux32/linux32_machdep.c
@@ -38,9 +38,9 @@
#include <sys/reg.h>
#include <sys/syscallsubr.h>
+#include <machine/ifunc.h>
#include <machine/md_var.h>
#include <machine/specialreg.h>
-#include <x86/ifunc.h>
#include <compat/freebsd32/freebsd32_util.h>
#include <amd64/linux32/linux.h>
diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
--- a/sys/amd64/vmm/vmm.c
+++ b/sys/amd64/vmm/vmm.c
@@ -56,13 +56,13 @@
#include <vm/swap_pager.h>
#include <vm/uma.h>
-#include <machine/cpu.h>
-#include <machine/pcb.h>
-#include <machine/smp.h>
-#include <machine/md_var.h>
-#include <x86/psl.h>
#include <x86/apicreg.h>
-#include <x86/ifunc.h>
+#include <machine/cpu.h>
+#include <machine/ifunc.h>
+#include <machine/md_var.h>
+#include <machine/pcb.h>
+#include <x86/psl.h>
+#include <machine/smp.h>
#include <machine/vmm.h>
#include <machine/vmm_instruction_emul.h>
diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_isa.c b/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
--- a/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
+++ b/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
@@ -38,7 +38,7 @@
#include <machine/frame.h>
#include <machine/md_var.h>
#include <machine/stack.h>
-#include <x86/ifunc.h>
+#include <machine/ifunc.h>
#include <vm/vm.h>
#include <vm/vm_param.h>
diff --git a/sys/i386/i386/npx.c b/sys/i386/i386/npx.c
--- a/sys/i386/i386/npx.c
+++ b/sys/i386/i386/npx.c
@@ -56,14 +56,14 @@
#include <machine/asmacros.h>
#include <machine/cputypes.h>
#include <machine/frame.h>
+#include <machine/ifunc.h>
#include <machine/md_var.h>
#include <machine/pcb.h>
#include <machine/psl.h>
#include <machine/resource.h>
-#include <machine/specialreg.h>
#include <machine/segments.h>
+#include <machine/specialreg.h>
#include <machine/ucontext.h>
-#include <x86/ifunc.h>
#include <machine/intr_machdep.h>
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -145,10 +145,10 @@
#include <machine/intr_machdep.h>
#include <x86/apicvar.h>
#endif
-#include <x86/ifunc.h>
#include <machine/bootinfo.h>
#include <machine/cpu.h>
#include <machine/cputypes.h>
+#include <machine/ifunc.h>
#include <machine/md_var.h>
#include <machine/pcb.h>
#include <machine/specialreg.h>
diff --git a/sys/i386/i386/pmap_base.c b/sys/i386/i386/pmap_base.c
--- a/sys/i386/i386/pmap_base.c
+++ b/sys/i386/i386/pmap_base.c
@@ -95,13 +95,13 @@
#include <machine/bootinfo.h>
#include <machine/cpu.h>
#include <machine/cputypes.h>
+#include <machine/ifunc.h>
#include <machine/md_var.h>
#ifdef DEV_APIC
#include <sys/bus.h>
#include <machine/intr_machdep.h>
#include <x86/apicvar.h>
#endif
-#include <x86/ifunc.h>
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
--- a/sys/libkern/gsb_crc32.c
+++ b/sys/libkern/gsb_crc32.c
@@ -52,7 +52,7 @@
#if defined(__amd64__) || defined(__i386__)
#include <machine/md_var.h>
#include <machine/specialreg.h>
-#include <x86/ifunc.h>
+#include <machine/ifunc.h>
#endif
#if defined(__aarch64__)
diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h
--- 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 <machine/intr_machdep.h>
+
/*
* Local && I/O APIC variable definitions.
*/
diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c
--- a/sys/x86/x86/cpu_machdep.c
+++ b/sys/x86/x86/cpu_machdep.c
@@ -74,8 +74,9 @@
#include <machine/cpu.h>
#include <machine/cpufunc.h>
#include <machine/cputypes.h>
-#include <machine/specialreg.h>
+#include <machine/ifunc.h>
#include <machine/md_var.h>
+#include <machine/specialreg.h>
#include <machine/trap.h>
#include <machine/tss.h>
#ifdef SMP
@@ -85,7 +86,6 @@
#include <machine/elan_mmcr.h>
#endif
#include <x86/acpica_machdep.h>
-#include <x86/ifunc.h>
#include <vm/vm.h>
#include <vm/vm_extern.h>

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 2, 1:08 PM (16 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40083005
Default Alt Text
D60194.diff (6 KB)

Event Timeline