intrcompat: replace many interrupt header includes with <machine/inte…

…rrupt.h> Referencing anything other than the fully compatible header is risky. Many of these will be expected to break due to lacking later compatibility adjustments. Avoid direct #include of headers besides <machine/interrupt.h>. Differential Revision: https://reviews.freebsd.org/D35559
freebsd · Oct 30, 2024 · b7da32e · b7da32e
1 parent 30d9445
commit b7da32e
Show file tree

Hide file tree

Showing 68 changed files with 86 additions and 86 deletions.
diff --git a/sys/arm/annapurna/alpine/alpine_pci.c b/sys/arm/annapurna/alpine/alpine_pci.c
@@ -36,7 +36,6 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
-#include <sys/intr.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>

diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c
@@ -38,7 +38,6 @@
 #include <sys/bus.h>
 #include <sys/busdma_bufalloc.h>
 #include <sys/counter.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
@@ -59,6 +58,7 @@
 #include <machine/atomic.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
+#include <machine/interrupt.h>
 #include <machine/md_var.h>
 
 //#define ARM_BUSDMA_MAPLOAD_STATS

diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c
@@ -42,7 +42,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
@@ -53,7 +52,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/broadcom/bcm2835/bcm2835_gpio.c b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
@@ -34,7 +34,6 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/gpio.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/module.h>
@@ -44,7 +43,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/bcm2838_pci.c b/sys/arm/broadcom/bcm2835/bcm2838_pci.c
@@ -33,7 +33,6 @@
 #include <sys/bus.h>
 #include <sys/proc.h>
 #include <sys/rman.h>
-#include <sys/intr.h>
 #include <sys/mutex.h>
 
 #include <dev/ofw/openfirm.h>
@@ -47,7 +46,6 @@
 #include <dev/pci/pcib_private.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 
 #include "pcib_if.h"
 #include "msi_if.h"

diff --git a/sys/arm/mv/gpio.c b/sys/arm/mv/gpio.c
@@ -36,7 +36,6 @@
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/interrupt.h>
 #include <sys/module.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
@@ -45,8 +44,9 @@
 #include <sys/timetc.h>
 #include <sys/callout.h>
 #include <sys/gpio.h>
+
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/gpio/gpiobusvar.h>
 #include <dev/ofw/ofw_bus.h>

diff --git a/sys/arm64/arm64/busdma_bounce.c b/sys/arm64/arm64/busdma_bounce.c
@@ -36,7 +36,6 @@
 #include <sys/domainset.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
@@ -55,6 +54,7 @@
 
 #include <machine/atomic.h>
 #include <machine/bus.h>
+#include <machine/interrupt.h>
 #include <machine/md_var.h>
 #include <arm64/include/bus_dma_impl.h>
 

diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c
@@ -47,14 +47,13 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/smp.h>
-#include <sys/interrupt.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #ifdef FDT
 #include <dev/fdt/fdt_intr.h>

diff --git a/sys/arm64/arm64/nexus.c b/sys/arm64/arm64/nexus.c
@@ -43,7 +43,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
@@ -54,7 +53,7 @@
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/machdep.h>
 #include <machine/pcb.h>
 #include <machine/resource.h>

diff --git a/sys/arm64/rockchip/rk3568_pcie.c b/sys/arm64/rockchip/rk3568_pcie.c
@@ -34,7 +34,6 @@
 #include <sys/bus.h>
 #include <sys/proc.h>
 #include <sys/rman.h>
-#include <sys/intr.h>
 #include <sys/mutex.h>
 #include <sys/gpio.h>
 
@@ -55,7 +54,6 @@
 #include <dev/hwreset/hwreset.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>

diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c
@@ -36,7 +36,6 @@
 #include <sys/time.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
-#include <sys/interrupt.h>
 #include <sys/sbuf.h>
 
 #include <sys/lock.h>
@@ -58,6 +57,7 @@
 #include <cam/mmc/mmc.h>
 #include <cam/mmc/mmc_bus.h>
 
+#include <machine/interrupt.h>
 #include <machine/stdarg.h>	/* for xpt_print below */
 #include <machine/_inttypes.h>  /* for PRIu64 */
 

diff --git a/sys/compat/linuxkpi/common/include/linux/hardirq.h b/sys/compat/linuxkpi/common/include/linux/hardirq.h
@@ -34,7 +34,8 @@
 
 #include <sys/param.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
+
+#include <machine/interrupt.h>
 
 #define	synchronize_irq(irq)	_intr_drain((irq))
 

diff --git a/sys/compat/linuxkpi/common/include/linux/interrupt.h b/sys/compat/linuxkpi/common/include/linux/interrupt.h
@@ -36,7 +36,8 @@
 #include <linux/hardirq.h>
 
 #include <sys/param.h>
-#include <sys/interrupt.h>
+
+#include <machine/interrupt.h>
 
 typedef	irqreturn_t	(*irq_handler_t)(int, void *);
 

diff --git a/sys/compat/linuxkpi/common/src/linux_kthread.c b/sys/compat/linuxkpi/common/src/linux_kthread.c
@@ -31,9 +31,10 @@
 #include <linux/wait.h>
 
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/priority.h>
 
+#include <machine/interrupt.h>
+
 enum {
 	KTHREAD_SHOULD_STOP_MASK = (1 << 0),
 	KTHREAD_SHOULD_PARK_MASK = (1 << 1),

diff --git a/sys/dev/acpica/acpi_apei.c b/sys/dev/acpica/acpi_apei.c
@@ -33,7 +33,6 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
@@ -42,6 +41,8 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
+#include <machine/interrupt.h>
+
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/aclocal.h>

diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
@@ -34,9 +34,6 @@
 #include "acpi_if.h"
 #include "bus_if.h"
 #include <sys/_eventhandler.h>
-#ifdef INTRNG
-#include <sys/intr.h>
-#endif
 #include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
@@ -45,6 +42,9 @@
 #include <sys/sysctl.h>
 
 #include <machine/bus.h>
+#ifdef INTRNG
+#include <machine/interrupt.h>
+#endif
 #include <machine/resource.h>
 
 struct apm_clone_data;

diff --git a/sys/dev/amdgpio/amdgpio.c b/sys/dev/amdgpio/amdgpio.c
@@ -33,7 +33,6 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/gpio.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/module.h>
@@ -43,6 +42,7 @@
 #include <sys/sysctl.h>
 
 #include <machine/bus.h>
+#include <machine/interrupt.h>
 #include <machine/resource.h>
 
 #include <contrib/dev/acpica/include/acpi.h>

diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c
@@ -30,9 +30,6 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/gpio.h>
-#ifdef INTRNG
-#include <sys/intr.h>
-#endif
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>

diff --git a/sys/dev/gpio/gpiobusvar.h b/sys/dev/gpio/gpiobusvar.h
@@ -41,7 +41,8 @@
 #endif
 
 #ifdef	INTRNG
-#include <sys/intr.h>
+/* touched by LINT-ACPI */
+#include <machine/interrupt.h>
 #endif
 
 #include "gpio_if.h"

diff --git a/sys/dev/gpio/pl061.c b/sys/dev/gpio/pl061.c
@@ -36,7 +36,6 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/gpio.h>
-#include <sys/interrupt.h>
 
 #include <machine/bus.h>
 #include <machine/intr.h>

diff --git a/sys/dev/hyperv/pcib/vmbus_pcib.c b/sys/dev/hyperv/pcib/vmbus_pcib.c
@@ -49,7 +49,7 @@
 #include <vm/pmap.h>
 
 #if defined(__aarch64__)
-#include <arm64/include/intr.h>
+#include <arm64/include/interrupt.h>
 #endif
 #include <machine/atomic.h>
 #include <machine/bus.h>

diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c
@@ -34,7 +34,6 @@
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
@@ -57,10 +56,12 @@
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
 #include <dev/iommu/iommu.h>
+
 #include <machine/atomic.h>
 #include <machine/bus.h>
-#include <machine/md_var.h>
+#include <machine/interrupt.h>
 #include <machine/iommu.h>
+#include <machine/md_var.h>
 #include <dev/iommu/busdma_iommu.h>
 
 /*

diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c
@@ -34,7 +34,6 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
@@ -63,6 +62,7 @@
 #include <machine/atomic.h>
 #include <machine/bus.h>
 #include <machine/md_var.h>
+#include <machine/interrupt.h>
 #include <machine/iommu.h>
 #include <dev/iommu/busdma_iommu.h>
 

diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c
@@ -75,12 +75,12 @@
 #include <sys/taskqueue.h>
 
 #include <machine/bus.h>
+#include <machine/interrupt.h>
 #include <machine/resource.h>
 
 #include <dev/mfi/mfireg.h>
 #include <dev/mfi/mfi_ioctl.h>
 #include <dev/mfi/mfivar.h>
-#include <sys/interrupt.h>
 #include <sys/priority.h>
 
 static int	mfi_alloc_commands(struct mfi_softc *);

diff --git a/sys/dev/mlx5/mlx5_en/en_rl.h b/sys/dev/mlx5/mlx5_en/en_rl.h
@@ -32,11 +32,12 @@
 #include <sys/sx.h>
 #include <sys/proc.h>
 #include <sys/condvar.h>
-#include <sys/interrupt.h>
 #include <sys/unistd.h>
 
 #include <sys/queue.h>
 
+#include <machine/interrupt.h>
+
 #define	MLX5E_RL_MAX_WORKERS		128	/* limited by Toeplitz hash */
 #define	MLX5E_RL_MAX_TX_RATES		(64 * 1024)	/* software limit */
 #define	MLX5E_RL_DEF_SQ_PER_WORKER	(12 * 1024)	/* software limit */

diff --git a/sys/dev/ntb/ntb_hw/ntb_hw_intel.c b/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
@@ -41,7 +41,6 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/endian.h>
-#include <sys/interrupt.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>

diff --git a/sys/dev/ntb/ntb_hw/ntb_hw_plx.c b/sys/dev/ntb/ntb_hw/ntb_hw_plx.c
@@ -35,7 +35,6 @@
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/module.h>
 #include <sys/rman.h>
 #include <sys/sysctl.h>

diff --git a/sys/dev/ofw/ofw_bus_subr.h b/sys/dev/ofw/ofw_bus_subr.h
@@ -33,7 +33,7 @@
 
 #include <sys/bus.h>
 #ifdef INTRNG
-#include <sys/intr.h>
+#include <machine/interrupt.h>
 #endif
 #include <dev/ofw/openfirm.h>