intrcompat: rename "machine/intr*.h" to "machine/interrupt.h"

Having two distinct names for the interrupt headers serves to interfere with most efforts to converge the interrupt frameworks. Simply rename all of them to "machine/interrupt.h". Define __MACHINE_INTERRUPT_H__ in i386/include/interrupt.h in order to be consistent with other platforms. This is otherwise silly, but consistency is important. Remove the #ifdefs in subr_bus.c as a step towards to making c85855a useful on other platforms. Do some sorting of #include order. Notably a bunch involving resource.h. Differential Revision: https://reviews.freebsd.org/D35559
freebsd · Dec 17, 2024 · decdad6 · decdad6
1 parent e8c7d72
commit decdad6
Show file tree

Hide file tree

Showing 258 changed files with 277 additions and 279 deletions.
diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c
@@ -45,7 +45,7 @@
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
-#include <machine/intr_machdep.h>
+#include <machine/interrupt.h>
 #include <machine/md_var.h>
 #include <x86/mca.h>
 #include <machine/pcb.h>

diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
@@ -51,7 +51,7 @@
 
 #include <machine/cputypes.h>
 #include <machine/frame.h>
-#include <machine/intr_machdep.h>
+#include <machine/interrupt.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>
 #include <machine/psl.h>

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
@@ -119,7 +119,7 @@
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
 #include <machine/frame.h>
-#include <machine/intr_machdep.h>
+#include <machine/interrupt.h>
 #include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/metadata.h>

diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
@@ -153,7 +153,7 @@
 #include <vm/uma.h>
 
 #include <machine/asan.h>
-#include <machine/intr_machdep.h>
+#include <machine/interrupt.h>
 #include <x86/apicvar.h>
 #include <x86/ifunc.h>
 #include <machine/cpu.h>

diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
@@ -83,7 +83,7 @@ PMC_SOFT_DEFINE( , , page_fault, write);
 #include <vm/vm_extern.h>
 
 #include <machine/cpu.h>
-#include <machine/intr_machdep.h>
+#include <machine/interrupt.h>
 #include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>

diff --git a/sys/amd64/ia32/ia32_syscall.c b/sys/amd64/ia32/ia32_syscall.c
@@ -75,7 +75,7 @@
 #include <vm/vm_extern.h>
 
 #include <machine/cpu.h>
-#include <machine/intr_machdep.h>
+#include <machine/interrupt.h>
 #include <machine/md_var.h>
 
 #include <compat/freebsd32/freebsd32_signal.h>

diff --git a/sys/amd64/include/intr_machdep.h → sys/amd64/include/interrupt.h b/sys/amd64/include/intr_machdep.h → sys/amd64/include/interrupt.h
@@ -25,10 +25,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef __MACHINE_INTR_MACHDEP_H__
-#define	__MACHINE_INTR_MACHDEP_H__
+#ifndef __MACHINE_INTERRUPT_H__
+#define	__MACHINE_INTERRUPT_H__
 
-#include <x86/intr_machdep.h>
+#include <x86/interrupt.h>
 
 /*
  * The following data structure holds per-cpu data, and is placed just
@@ -44,4 +44,4 @@ struct nmi_pcpu {
 #define	MCE_STACK_SIZE		PAGE_SIZE
 #define	DBG_STACK_SIZE		PAGE_SIZE
 
-#endif	/* !__MACHINE_INTR_MACHDEP_H__ */
+#endif	/* !__MACHINE_INTERRUPT_H__ */
diff --git a/sys/arm/allwinner/a10/a10_intc.c b/sys/arm/allwinner/a10/a10_intc.c
@@ -44,7 +44,7 @@
 #include <sys/systm.h>
 #include <sys/sched.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>

diff --git a/sys/arm/allwinner/a10_sramc.c b/sys/arm/allwinner/a10_sramc.c
@@ -39,7 +39,7 @@
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>

diff --git a/sys/arm/allwinner/a10_timer.c b/sys/arm/allwinner/a10_timer.c
@@ -35,7 +35,7 @@
 #include <sys/timetc.h>
 #include <sys/watchdog.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/machdep.h>
 
 #include <dev/ofw/openfirm.h>

diff --git a/sys/arm/allwinner/a20/a20_cpu_cfg.c b/sys/arm/allwinner/a20/a20_cpu_cfg.c
@@ -40,7 +40,7 @@
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>

diff --git a/sys/arm/allwinner/aw_gpio.c b/sys/arm/allwinner/aw_gpio.c
@@ -43,8 +43,8 @@
 #include <sys/proc.h>
 
 #include <machine/bus.h>
+#include <machine/interrupt.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
 
 #include <dev/gpio/gpiobusvar.h>
 #include <dev/ofw/ofw_bus.h>

diff --git a/sys/arm/allwinner/aw_mp.c b/sys/arm/allwinner/aw_mp.c
@@ -38,7 +38,7 @@
 #include <machine/cpu.h>
 #include <machine/smp.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/platformvar.h>
 
 #include <arm/allwinner/aw_mp.h>

diff --git a/sys/arm/allwinner/aw_nmi.c b/sys/arm/allwinner/aw_nmi.c
@@ -34,7 +34,7 @@
 #include <sys/proc.h>
 #include <sys/rman.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/fdt/fdt_intr.h>
 #include <dev/ofw/openfirm.h>

diff --git a/sys/arm/allwinner/aw_r_intc.c b/sys/arm/allwinner/aw_r_intc.c
@@ -30,7 +30,7 @@
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>

diff --git a/sys/arm/allwinner/if_emac.c b/sys/arm/allwinner/if_emac.c
@@ -43,8 +43,8 @@
 #include <sys/gpio.h>
 
 #include <machine/bus.h>
+#include <machine/interrupt.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
 
 #include <net/if.h>
 #include <net/if_var.h>

diff --git a/sys/arm/annapurna/alpine/alpine_machdep_mp.c b/sys/arm/annapurna/alpine/alpine_machdep_mp.c
@@ -39,7 +39,7 @@
 
 #include <machine/smp.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/cpu.h>
 #include <machine/platformvar.h>
 

diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S
@@ -51,7 +51,7 @@
 #include <machine/asm.h>
 #include <machine/armreg.h>
 #include <machine/asmacros.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/trap.h>
 
 #ifdef KDTRACE_HOOKS

diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c
@@ -54,7 +54,7 @@
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/machdep.h>
 #include <machine/md_var.h>
 

diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c
@@ -58,7 +58,7 @@
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/smp.h>
 
 #ifdef FDT

diff --git a/sys/arm/arm/gic_acpi.c b/sys/arm/arm/gic_acpi.c
@@ -44,7 +44,7 @@
 #include <sys/malloc.h>
 #include <sys/module.h>
 
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <dev/acpica/acpivar.h>

diff --git a/sys/arm/arm/gic_fdt.c b/sys/arm/arm/gic_fdt.c
@@ -42,7 +42,7 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>

diff --git a/sys/arm/arm/machdep_intr.c b/sys/arm/arm/machdep_intr.c
@@ -32,7 +32,7 @@
 
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 /*
  * arm_irq_memory_barrier()

diff --git a/sys/arm/arm/mp_machdep.c b/sys/arm/arm/mp_machdep.c
@@ -51,7 +51,7 @@
 #include <machine/debug_monitor.h>
 #include <machine/smp.h>
 #include <machine/pcb.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/vmparam.h>
 #ifdef VFP
 #include <machine/vfp.h>

diff --git a/sys/arm/arm/mpcore_timer.c b/sys/arm/arm/mpcore_timer.c
@@ -56,7 +56,7 @@
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <machine/machdep.h> /* For arm_set_delay */
 

diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c
@@ -53,7 +53,7 @@
 
 #include <machine/bus.h>
 #include <machine/pcb.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/resource.h>
 #include <machine/vmparam.h>
 

diff --git a/sys/arm/arm/pl310.c b/sys/arm/arm/pl310.c
@@ -38,7 +38,7 @@
 #include <sys/module.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <machine/bus.h>
 #include <machine/pl310.h>

diff --git a/sys/arm/arm/platform.c b/sys/arm/arm/platform.c
@@ -49,7 +49,7 @@
 
 #include <machine/bus_dma.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/machdep.h>
 #include <machine/md_var.h>
 #include <machine/platform.h>

diff --git a/sys/arm/arm/pmu.c b/sys/arm/arm/pmu.c
@@ -50,7 +50,7 @@
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include "pmu.h"
 

diff --git a/sys/arm/arm/sp804.c b/sys/arm/arm/sp804.c
@@ -39,7 +39,7 @@
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <machine/machdep.h> /* For arm_set_delay */
 

diff --git a/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c b/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
@@ -39,7 +39,7 @@
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>

diff --git a/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c b/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c
@@ -52,7 +52,7 @@
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <arm/broadcom/bcm2835/bcm2835_mbox.h>
 #include <arm/broadcom/bcm2835/bcm2835_mbox_prop.h>

diff --git a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
@@ -44,7 +44,7 @@
 #include <sys/sysctl.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/fdt/fdt_pinctrl.h>
 #include <dev/gpio/gpiobusvar.h>

diff --git a/sys/arm/broadcom/bcm2835/bcm2835_intr.c b/sys/arm/broadcom/bcm2835/bcm2835_intr.c
@@ -40,7 +40,7 @@
 #include <sys/proc.h>
 #include <sys/rman.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>

diff --git a/sys/arm/broadcom/bcm2835/bcm2835_spi.c b/sys/arm/broadcom/bcm2835/bcm2835_spi.c
@@ -41,7 +41,7 @@
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>

diff --git a/sys/arm/broadcom/bcm2835/bcm2836.c b/sys/arm/broadcom/bcm2835/bcm2836.c
@@ -44,7 +44,7 @@
 #endif
 
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/resource.h>
 #ifdef SMP
 #include <machine/smp.h>

diff --git a/sys/arm/broadcom/bcm2835/bcm2836_mp.c b/sys/arm/broadcom/bcm2835/bcm2836_mp.c
@@ -41,7 +41,7 @@
 #include <machine/smp.h>
 #include <machine/bus.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/platformvar.h>
 
 #include <arm/broadcom/bcm2835/bcm2836_mp.h>

diff --git a/sys/arm/freescale/imx/imx6_audmux.c b/sys/arm/freescale/imx/imx6_audmux.c
@@ -47,7 +47,7 @@
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #define	READ4(_sc, _reg)	\
 	bus_space_read_4(_sc->bst, _sc->bsh, _reg)

diff --git a/sys/arm/freescale/imx/imx6_machdep.c b/sys/arm/freescale/imx/imx6_machdep.c
@@ -37,7 +37,7 @@
 #include <vm/vm.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/machdep.h>
 #include <machine/platformvar.h>
 

diff --git a/sys/arm/freescale/imx/imx6_mp.c b/sys/arm/freescale/imx/imx6_mp.c
@@ -40,7 +40,7 @@
 #include <machine/cpu.h>
 #include <machine/smp.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/platform.h>
 #include <machine/platformvar.h>
 

diff --git a/sys/arm/freescale/imx/imx6_sdma.c b/sys/arm/freescale/imx/imx6_sdma.c
@@ -53,7 +53,7 @@
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <arm/freescale/imx/imx6_sdma.h>
 

diff --git a/sys/arm/freescale/imx/imx6_ssi.c b/sys/arm/freescale/imx/imx6_ssi.c
@@ -50,7 +50,7 @@
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <arm/freescale/imx/imx6_sdma.h>
 #include <arm/freescale/imx/imx6_anatopvar.h>

diff --git a/sys/arm/freescale/imx/imx_epit.c b/sys/arm/freescale/imx/imx_epit.c
@@ -43,7 +43,7 @@
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/machdep.h>
 
 #include <dev/fdt/fdt_common.h>