From 5c522ccf6dcb1c55379e89d78ac2235b7544c276 Mon Sep 17 00:00:00 2001
From: Julien Grall <julien.grall@linaro.org>
Date: Sun, 22 Jun 2014 17:13:10 +0100
Subject: [PATCH 42/48] arm: rename intr.h into intr_machdep.h

ARM is the only architecture where the interrupt header is named "intr.h"
rather than "intr_machdep.h". There is numerous place (such as Xen) in the
generic code which need to deal with interrupt management.
---
 sys/arm/allwinner/a10_clk.c                 |  2 +-
 sys/arm/allwinner/a10_gpio.c                |  2 +-
 sys/arm/allwinner/a10_sramc.c               |  2 +-
 sys/arm/allwinner/a20/a20_cpu_cfg.c         |  2 +-
 sys/arm/allwinner/a20/a20_mp.c              |  2 +-
 sys/arm/allwinner/aintc.c                   |  2 +-
 sys/arm/allwinner/if_emac.c                 |  2 +-
 sys/arm/allwinner/timer.c                   |  2 +-
 sys/arm/altera/socfpga/socfpga_manager.c    |  2 +-
 sys/arm/altera/socfpga/socfpga_mp.c         |  2 +-
 sys/arm/altera/socfpga/socfpga_rstmgr.c     |  2 +-
 sys/arm/arm/genassym.c                      |  2 +-
 sys/arm/arm/generic_timer.c                 |  2 +-
 sys/arm/arm/gic.c                           |  2 +-
 sys/arm/arm/intr.c                          |  2 +-
 sys/arm/arm/machdep.c                       |  2 +-
 sys/arm/arm/mp_machdep.c                    |  2 +-
 sys/arm/arm/mpcore_timer.c                  |  2 +-
 sys/arm/arm/nexus.c                         |  2 +-
 sys/arm/arm/pl190.c                         |  2 +-
 sys/arm/arm/pl310.c                         |  2 +-
 sys/arm/arm/platform.c                      |  2 +-
 sys/arm/arm/trap.c                          |  2 +-
 sys/arm/at91/at91.c                         |  2 +-
 sys/arm/at91/at91_aic.c                     |  2 +-
 sys/arm/at91/at91_cfata.c                   |  2 +-
 sys/arm/at91/at91_mci.c                     |  2 +-
 sys/arm/at91/at91_pit.c                     |  2 +-
 sys/arm/at91/at91_pmc.c                     |  2 +-
 sys/arm/at91/at91_st.c                      |  2 +-
 sys/arm/at91/if_macb.c                      |  2 +-
 sys/arm/broadcom/bcm2835/bcm2835_fb.c       |  2 +-
 sys/arm/broadcom/bcm2835/bcm2835_fbd.c      |  2 +-
 sys/arm/broadcom/bcm2835/bcm2835_gpio.c     |  2 +-
 sys/arm/broadcom/bcm2835/bcm2835_intr.c     |  2 +-
 sys/arm/broadcom/bcm2835/bcm2835_mbox.c     |  2 +-
 sys/arm/broadcom/bcm2835/bcm2835_sdhci.c    |  2 +-
 sys/arm/broadcom/bcm2835/bcm2835_spi.c      |  2 +-
 sys/arm/broadcom/bcm2835/bcm2835_systimer.c |  2 +-
 sys/arm/cavium/cns11xx/econa.c              |  2 +-
 sys/arm/cavium/cns11xx/if_ece.c             |  2 +-
 sys/arm/cavium/cns11xx/timer.c              |  2 +-
 sys/arm/freescale/imx/imx51_ccm.c           |  2 +-
 sys/arm/freescale/imx/imx51_ipuv3.c         |  2 +-
 sys/arm/freescale/imx/imx51_ipuv3_fbd.c     |  2 +-
 sys/arm/freescale/imx/imx6_machdep.c        |  2 +-
 sys/arm/freescale/imx/imx6_mp.c             |  2 +-
 sys/arm/freescale/imx/imx_gpt.c             |  2 +-
 sys/arm/freescale/imx/imx_sdhci.c           |  2 +-
 sys/arm/freescale/imx/imx_wdog.c            |  2 +-
 sys/arm/freescale/imx/tzic.c                |  2 +-
 sys/arm/freescale/vybrid/vf_adc.c           |  2 +-
 sys/arm/freescale/vybrid/vf_anadig.c        |  2 +-
 sys/arm/freescale/vybrid/vf_ccm.c           |  2 +-
 sys/arm/freescale/vybrid/vf_dcu4.c          |  2 +-
 sys/arm/freescale/vybrid/vf_dmamux.c        |  2 +-
 sys/arm/freescale/vybrid/vf_edma.c          |  2 +-
 sys/arm/freescale/vybrid/vf_gpio.c          |  2 +-
 sys/arm/freescale/vybrid/vf_i2c.c           |  2 +-
 sys/arm/freescale/vybrid/vf_iomuxc.c        |  2 +-
 sys/arm/freescale/vybrid/vf_mscm.c          |  2 +-
 sys/arm/freescale/vybrid/vf_port.c          |  2 +-
 sys/arm/freescale/vybrid/vf_sai.c           |  2 +-
 sys/arm/freescale/vybrid/vf_spi.c           |  2 +-
 sys/arm/freescale/vybrid/vf_src.c           |  2 +-
 sys/arm/freescale/vybrid/vf_tcon.c          |  2 +-
 sys/arm/include/fdt.h                       |  2 +-
 sys/arm/include/intr.h                      | 88 -----------------------------
 sys/arm/include/intr_machdep.h              | 88 +++++++++++++++++++++++++++++
 sys/arm/lpc/if_lpe.c                        |  2 +-
 sys/arm/lpc/lpc_fb.c                        |  2 +-
 sys/arm/lpc/lpc_gpio.c                      |  2 +-
 sys/arm/lpc/lpc_intc.c                      |  2 +-
 sys/arm/lpc/lpc_mmc.c                       |  2 +-
 sys/arm/lpc/lpc_pwr.c                       |  2 +-
 sys/arm/lpc/lpc_spi.c                       |  2 +-
 sys/arm/lpc/lpc_timer.c                     |  2 +-
 sys/arm/mv/gpio.c                           |  2 +-
 sys/arm/mv/ic.c                             |  2 +-
 sys/arm/mv/mpic.c                           |  2 +-
 sys/arm/mv/mv_pci.c                         |  2 +-
 sys/arm/mv/orion/db88f5xxx.c                |  2 +-
 sys/arm/mv/timer.c                          |  2 +-
 sys/arm/rockchip/rk30xx_gpio.c              |  2 +-
 sys/arm/rockchip/rk30xx_grf.c               |  2 +-
 sys/arm/rockchip/rk30xx_mp.c                |  2 +-
 sys/arm/rockchip/rk30xx_pmu.c               |  2 +-
 sys/arm/samsung/exynos/chrome_ec.c          |  2 +-
 sys/arm/samsung/exynos/chrome_ec_spi.c      |  2 +-
 sys/arm/samsung/exynos/chrome_kb.c          |  2 +-
 sys/arm/samsung/exynos/exynos5_combiner.c   |  2 +-
 sys/arm/samsung/exynos/exynos5_fimd.c       |  2 +-
 sys/arm/samsung/exynos/exynos5_i2c.c        |  2 +-
 sys/arm/samsung/exynos/exynos5_mct.c        |  2 +-
 sys/arm/samsung/exynos/exynos5_mp.c         |  2 +-
 sys/arm/samsung/exynos/exynos5_pad.c        |  2 +-
 sys/arm/samsung/exynos/exynos5_pmu.c        |  2 +-
 sys/arm/samsung/exynos/exynos5_spi.c        |  2 +-
 sys/arm/samsung/exynos/exynos5_usb_phy.c    |  2 +-
 sys/arm/samsung/exynos/exynos_uart.c        |  2 +-
 sys/arm/samsung/s3c2xx0/s3c24x0.c           |  2 +-
 sys/arm/samsung/s3c2xx0/s3c24x0_clk.c       |  2 +-
 sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c  |  2 +-
 sys/arm/ti/aintc.c                          |  2 +-
 sys/arm/ti/am335x/am335x_dmtimer.c          |  2 +-
 sys/arm/ti/am335x/am335x_gpio.c             |  2 +-
 sys/arm/ti/am335x/am335x_lcd_syscons.c      |  2 +-
 sys/arm/ti/am335x/am335x_prcm.c             |  2 +-
 sys/arm/ti/am335x/am335x_scm_padconf.c      |  2 +-
 sys/arm/ti/omap4/omap4_mp.c                 |  2 +-
 sys/arm/ti/omap4/omap4_prcm_clks.c          |  2 +-
 sys/arm/ti/omap4/omap4var.h                 |  2 +-
 sys/arm/ti/ti_cpuid.c                       |  2 +-
 sys/arm/ti/ti_mbox.c                        |  2 +-
 sys/arm/ti/ti_prcm.c                        |  2 +-
 sys/arm/ti/ti_pruss.c                       |  2 +-
 sys/arm/ti/ti_sdhci.c                       |  2 +-
 sys/arm/ti/ti_sdma.c                        |  2 +-
 sys/arm/ti/ti_wdt.c                         |  2 +-
 sys/arm/ti/twl/twl.c                        |  2 +-
 sys/arm/ti/twl/twl_clks.c                   |  2 +-
 sys/arm/ti/twl/twl_vreg.c                   |  2 +-
 sys/arm/versatile/pl050.c                   |  2 +-
 sys/arm/versatile/sp804.c                   |  2 +-
 sys/arm/versatile/versatile_clcd.c          |  2 +-
 sys/arm/versatile/versatile_pci.c           |  2 +-
 sys/arm/versatile/versatile_sic.c           |  2 +-
 sys/arm/versatile/versatile_timer.c         |  2 +-
 sys/arm/xilinx/zy7_mp.c                     |  2 +-
 sys/arm/xscale/i80321/i80321.c              |  2 +-
 sys/arm/xscale/i80321/i80321_timer.c        |  2 +-
 sys/arm/xscale/i80321/iq80321.c             |  2 +-
 sys/arm/xscale/i8134x/i81342.c              |  2 +-
 sys/arm/xscale/ixp425/avila_ata.c           |  2 +-
 sys/arm/xscale/ixp425/ixdp425_pci.c         |  2 +-
 sys/arm/xscale/ixp425/ixp425.c              |  2 +-
 sys/arm/xscale/ixp425/ixp425_npe.c          |  2 +-
 sys/arm/xscale/ixp425/ixp425_qmgr.c         |  2 +-
 sys/arm/xscale/ixp425/ixp425_timer.c        |  2 +-
 sys/arm/xscale/ixp425/ixp425_wdog.c         |  2 +-
 sys/arm/xscale/pxa/pxa_gpio.c               |  2 +-
 sys/arm/xscale/pxa/pxa_icu.c                |  2 +-
 sys/arm/xscale/pxa/pxa_obio.c               |  2 +-
 sys/arm/xscale/pxa/pxa_smi.c                |  2 +-
 sys/arm/xscale/pxa/pxa_timer.c              |  2 +-
 145 files changed, 231 insertions(+), 231 deletions(-)
 delete mode 100644 sys/arm/include/intr.h
 create mode 100644 sys/arm/include/intr_machdep.h

diff --git a/sys/arm/allwinner/a10_clk.c b/sys/arm/allwinner/a10_clk.c
index af7e875..54e1dd5 100644
--- a/sys/arm/allwinner/a10_clk.c
+++ b/sys/arm/allwinner/a10_clk.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/allwinner/a10_gpio.c b/sys/arm/allwinner/a10_gpio.c
index 23bf399..2d63c7d 100644
--- a/sys/arm/allwinner/a10_gpio.c
+++ b/sys/arm/allwinner/a10_gpio.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/allwinner/a10_sramc.c b/sys/arm/allwinner/a10_sramc.c
index fc71c7d..a78c53a 100644
--- a/sys/arm/allwinner/a10_sramc.c
+++ b/sys/arm/allwinner/a10_sramc.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <machine/fdt.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/allwinner/a20/a20_cpu_cfg.c b/sys/arm/allwinner/a20/a20_cpu_cfg.c
index 81f6a50..1b3cbc6 100644
--- a/sys/arm/allwinner/a20/a20_cpu_cfg.c
+++ b/sys/arm/allwinner/a20/a20_cpu_cfg.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/allwinner/a20/a20_mp.c b/sys/arm/allwinner/a20/a20_mp.c
index 463aec8..4995d72 100644
--- a/sys/arm/allwinner/a20/a20_mp.c
+++ b/sys/arm/allwinner/a20/a20_mp.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/smp.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #define	CPUCFG_BASE		0x01c25c00
 #define	CPUCFG_SIZE		0x400
diff --git a/sys/arm/allwinner/aintc.c b/sys/arm/allwinner/aintc.c
index ed5f1fc..1ace5bb 100644
--- a/sys/arm/allwinner/aintc.c
+++ b/sys/arm/allwinner/aintc.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/rman.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/allwinner/if_emac.c b/sys/arm/allwinner/if_emac.c
index 7828661..e6bbc97 100644
--- a/sys/arm/allwinner/if_emac.c
+++ b/sys/arm/allwinner/if_emac.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
diff --git a/sys/arm/allwinner/timer.c b/sys/arm/allwinner/timer.c
index a04fafa..8d64cf2 100644
--- a/sys/arm/allwinner/timer.c
+++ b/sys/arm/allwinner/timer.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/altera/socfpga/socfpga_manager.c b/sys/arm/altera/socfpga/socfpga_manager.c
index 47fd23f..90e4e83 100644
--- a/sys/arm/altera/socfpga/socfpga_manager.c
+++ b/sys/arm/altera/socfpga/socfpga_manager.c
@@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/altera/socfpga/socfpga_common.h>
 
diff --git a/sys/arm/altera/socfpga/socfpga_mp.c b/sys/arm/altera/socfpga/socfpga_mp.c
index 37a009c..b8fca47 100644
--- a/sys/arm/altera/socfpga/socfpga_mp.c
+++ b/sys/arm/altera/socfpga/socfpga_mp.c
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/smp.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #define	SCU_PHYSBASE			0xFFFEC000
 #define	SCU_SIZE			0x100
diff --git a/sys/arm/altera/socfpga/socfpga_rstmgr.c b/sys/arm/altera/socfpga/socfpga_rstmgr.c
index 36a1d75..7ad51cb 100644
--- a/sys/arm/altera/socfpga/socfpga_rstmgr.c
+++ b/sys/arm/altera/socfpga/socfpga_rstmgr.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/altera/socfpga/socfpga_common.h>
 #include <arm/altera/socfpga/socfpga_rstmgr.h>
diff --git a/sys/arm/arm/genassym.c b/sys/arm/arm/genassym.c
index ab0be4c..d2f320b 100644
--- a/sys/arm/arm/genassym.c
+++ b/sys/arm/arm/genassym.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/proc.h>
 #include <machine/cpufunc.h>
 #include <machine/pte.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <machine/sysarch.h>
 
 #include <netinet/in.h>
diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c
index a447353..28643d2 100644
--- a/sys/arm/arm/generic_timer.c
+++ b/sys/arm/arm/generic_timer.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c
index f1bb014..b5eed99 100644
--- a/sys/arm/arm/gic.c
+++ b/sys/arm/arm/gic.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <machine/smp.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/arm/intr.c b/sys/arm/arm/intr.c
index 83eca07..d56f7f8 100644
--- a/sys/arm/arm/intr.c
+++ b/sys/arm/arm/intr.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/interrupt.h>
 #include <sys/conf.h>
 #include <machine/atomic.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <machine/cpu.h>
 
 #define	INTRNAME_LEN	(MAXCOMLEN + 1)
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index 341ea4a..739840c 100644
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -92,7 +92,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/devmap.h>
 #include <machine/frame.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <machine/machdep.h>
 #include <machine/md_var.h>
 #include <machine/metadata.h>
diff --git a/sys/arm/arm/mp_machdep.c b/sys/arm/arm/mp_machdep.c
index a1b29c1..36dd504 100644
--- a/sys/arm/arm/mp_machdep.c
+++ b/sys/arm/arm/mp_machdep.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/pcb.h>
 #include <machine/pte.h>
 #include <machine/physmem.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.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
index 62c5344..1ed79f6 100644
--- a/sys/arm/arm/mpcore_timer.c
+++ b/sys/arm/arm/mpcore_timer.c
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c
index 6678d5d..b879c86 100644
--- a/sys/arm/arm/nexus.c
+++ b/sys/arm/arm/nexus.c
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include "opt_platform.h"
 
diff --git a/sys/arm/arm/pl190.c b/sys/arm/arm/pl190.c
index 5e81134..2bc1e0b 100644
--- a/sys/arm/arm/pl190.c
+++ b/sys/arm/arm/pl190.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/rman.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/arm/pl310.c b/sys/arm/arm/pl310.c
index b354bf8..a4277b4 100644
--- a/sys/arm/arm/pl310.c
+++ b/sys/arm/arm/pl310.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <machine/bus.h>
 #include <machine/pl310.h>
diff --git a/sys/arm/arm/platform.c b/sys/arm/arm/platform.c
index 8dcccc7..585e63b 100644
--- a/sys/arm/arm/platform.c
+++ b/sys/arm/arm/platform.c
@@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus_dma.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <machine/md_var.h>
 #include <machine/platform.h>
 #include <machine/platformvar.h>
diff --git a/sys/arm/arm/trap.c b/sys/arm/arm/trap.c
index 302ac4f..1bbd01b 100644
--- a/sys/arm/arm/trap.c
+++ b/sys/arm/arm/trap.c
@@ -750,4 +750,4 @@ badaddr_read(void *addr, size_t size, void *rptr)
 
 	/* Return EFAULT if the address was invalid, else zero */
 	return (rv);
-}
\ No newline at end of file
+}
diff --git a/sys/arm/at91/at91.c b/sys/arm/at91/at91.c
index 1942389..cd1a4b0 100644
--- a/sys/arm/at91/at91.c
+++ b/sys/arm/at91/at91.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <machine/bus.h>
 #include <machine/devmap.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/at91/at91var.h>
 #include <arm/at91/at91_pmcvar.h>
diff --git a/sys/arm/at91/at91_aic.c b/sys/arm/at91/at91_aic.c
index 300c99a..c3d7bb0 100644
--- a/sys/arm/at91/at91_aic.c
+++ b/sys/arm/at91/at91_aic.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/frame.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <machine/resource.h>
 
 #include <arm/at91/at91var.h>
diff --git a/sys/arm/at91/at91_cfata.c b/sys/arm/at91/at91_cfata.c
index 37ce434..c59a27a 100644
--- a/sys/arm/at91/at91_cfata.c
+++ b/sys/arm/at91/at91_cfata.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <sys/ata.h>
 #include <dev/ata/ata-all.h>
diff --git a/sys/arm/at91/at91_mci.c b/sys/arm/at91/at91_mci.c
index 5d426cf..960519c 100644
--- a/sys/arm/at91/at91_mci.c
+++ b/sys/arm/at91/at91_mci.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/at91/at91var.h>
 #include <arm/at91/at91_mcireg.h>
diff --git a/sys/arm/at91/at91_pit.c b/sys/arm/at91/at91_pit.c
index a4b58eb..5ce119a 100644
--- a/sys/arm/at91/at91_pit.c
+++ b/sys/arm/at91/at91_pit.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/frame.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <machine/resource.h>
 
 #include <arm/at91/at91var.h>
diff --git a/sys/arm/at91/at91_pmc.c b/sys/arm/at91/at91_pmc.c
index 13d5ff7..a49d1d8 100644
--- a/sys/arm/at91/at91_pmc.c
+++ b/sys/arm/at91/at91_pmc.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <arm/at91/at91reg.h>
 #include <arm/at91/at91var.h>
 
diff --git a/sys/arm/at91/at91_st.c b/sys/arm/at91/at91_st.c
index a18be2e..b0b1001 100644
--- a/sys/arm/at91/at91_st.c
+++ b/sys/arm/at91/at91_st.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
 #include <machine/frame.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <arm/at91/at91var.h>
 #include <arm/at91/at91_streg.h>
 #include <arm/at91/at91rm92reg.h>
diff --git a/sys/arm/at91/if_macb.c b/sys/arm/at91/if_macb.c
index a7acc31..bfab797 100644
--- a/sys/arm/at91/if_macb.c
+++ b/sys/arm/at91/if_macb.c
@@ -70,7 +70,7 @@ __FBSDID("$FreeBSD$");
 #include <arm/at91/at91sam9g20reg.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 /* "device miibus" required.  See GENERIC if you get errors here. */
 #include "miibus_if.h"
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_fb.c b/sys/arm/broadcom/bcm2835/bcm2835_fb.c
index 88156ed..64a921e 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_fb.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_fb.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_fbd.c b/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
index ed625bc..ad70b42 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpufunc.h>
 #include <machine/fdt.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
index 0ade78f..f06576e 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_intr.c b/sys/arm/broadcom/bcm2835/bcm2835_intr.c
index 7a06eb0..a579bd1 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_intr.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_intr.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/rman.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_mbox.c b/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
index 7628eb6..f15e0c8 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
index 9f3c27b..6cde433 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.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
index c9f6d33..b7a6030 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_spi.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_spi.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_systimer.c b/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
index 5e73747..07ac3db 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/cavium/cns11xx/econa.c b/sys/arm/cavium/cns11xx/econa.c
index c331e20..0f6cbb2 100644
--- a/sys/arm/cavium/cns11xx/econa.c
+++ b/sys/arm/cavium/cns11xx/econa.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <machine/armreg.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <machine/resource.h>
 
 #include "econa_reg.h"
diff --git a/sys/arm/cavium/cns11xx/if_ece.c b/sys/arm/cavium/cns11xx/if_ece.c
index 20bc07e..539ca1c 100644
--- a/sys/arm/cavium/cns11xx/if_ece.c
+++ b/sys/arm/cavium/cns11xx/if_ece.c
@@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$");
 #include <arm/cavium/cns11xx/econa_var.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 /* "device miibus" required.  See GENERIC if you get errors here. */
 #include "miibus_if.h"
diff --git a/sys/arm/cavium/cns11xx/timer.c b/sys/arm/cavium/cns11xx/timer.c
index e79a70a..d122526 100644
--- a/sys/arm/cavium/cns11xx/timer.c
+++ b/sys/arm/cavium/cns11xx/timer.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include "econa_reg.h"
 #include "econa_var.h"
diff --git a/sys/arm/freescale/imx/imx51_ccm.c b/sys/arm/freescale/imx/imx51_ccm.c
index 8e099ce5..4dc3c72 100644
--- a/sys/arm/freescale/imx/imx51_ccm.c
+++ b/sys/arm/freescale/imx/imx51_ccm.c
@@ -70,7 +70,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/freescale/imx/imx51_ipuv3.c b/sys/arm/freescale/imx/imx51_ipuv3.c
index 6c0a9eb..4b72dbb 100644
--- a/sys/arm/freescale/imx/imx51_ipuv3.c
+++ b/sys/arm/freescale/imx/imx51_ipuv3.c
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpufunc.h>
 #include <machine/fdt.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/freescale/imx/imx51_ipuv3_fbd.c b/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
index 4828240..f455767 100644
--- a/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
+++ b/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/fdt.h>
 #include <machine/resource.h>
 #include <machine/frame.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/freescale/imx/imx6_machdep.c b/sys/arm/freescale/imx/imx6_machdep.c
index 510a09b..d275127 100644
--- a/sys/arm/freescale/imx/imx6_machdep.c
+++ b/sys/arm/freescale/imx/imx6_machdep.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/devmap.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <machine/machdep.h>
 #include <machine/platform.h> 
 
diff --git a/sys/arm/freescale/imx/imx6_mp.c b/sys/arm/freescale/imx/imx6_mp.c
index e6366dd..089987a 100644
--- a/sys/arm/freescale/imx/imx6_mp.c
+++ b/sys/arm/freescale/imx/imx6_mp.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/smp.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #define	SCU_PHYSBASE			0x00a00000
 #define	SCU_SIZE			0x00001000
diff --git a/sys/arm/freescale/imx/imx_gpt.c b/sys/arm/freescale/imx/imx_gpt.c
index 6f77963..1d548f2 100644
--- a/sys/arm/freescale/imx/imx_gpt.c
+++ b/sys/arm/freescale/imx/imx_gpt.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <machine/fdt.h>
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/freescale/imx/imx_sdhci.c b/sys/arm/freescale/imx/imx_sdhci.c
index f197309..068e99d 100644
--- a/sys/arm/freescale/imx/imx_sdhci.c
+++ b/sys/arm/freescale/imx/imx_sdhci.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/freescale/imx/imx_ccmvar.h>
 
diff --git a/sys/arm/freescale/imx/imx_wdog.c b/sys/arm/freescale/imx/imx_wdog.c
index cadd1d7..ab7c2e0 100644
--- a/sys/arm/freescale/imx/imx_wdog.c
+++ b/sys/arm/freescale/imx/imx_wdog.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/freescale/imx/tzic.c b/sys/arm/freescale/imx/tzic.c
index 0f3cf5c..ddad0e4 100644
--- a/sys/arm/freescale/imx/tzic.c
+++ b/sys/arm/freescale/imx/tzic.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/freescale/vybrid/vf_adc.c b/sys/arm/freescale/vybrid/vf_adc.c
index f497ec0..b1b4d4d 100644
--- a/sys/arm/freescale/vybrid/vf_adc.c
+++ b/sys/arm/freescale/vybrid/vf_adc.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/freescale/vybrid/vf_common.h>
 #include <arm/freescale/vybrid/vf_adc.h>
diff --git a/sys/arm/freescale/vybrid/vf_anadig.c b/sys/arm/freescale/vybrid/vf_anadig.c
index 77946d3..399df06 100644
--- a/sys/arm/freescale/vybrid/vf_anadig.c
+++ b/sys/arm/freescale/vybrid/vf_anadig.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/freescale/vybrid/vf_common.h>
 
diff --git a/sys/arm/freescale/vybrid/vf_ccm.c b/sys/arm/freescale/vybrid/vf_ccm.c
index 30df67a..5139a15 100644
--- a/sys/arm/freescale/vybrid/vf_ccm.c
+++ b/sys/arm/freescale/vybrid/vf_ccm.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/freescale/vybrid/vf_common.h>
 
diff --git a/sys/arm/freescale/vybrid/vf_dcu4.c b/sys/arm/freescale/vybrid/vf_dcu4.c
index d2ddddc..f5de6be 100644
--- a/sys/arm/freescale/vybrid/vf_dcu4.c
+++ b/sys/arm/freescale/vybrid/vf_dcu4.c
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include "fb_if.h"
 
diff --git a/sys/arm/freescale/vybrid/vf_dmamux.c b/sys/arm/freescale/vybrid/vf_dmamux.c
index 1909621..f80e2c6 100644
--- a/sys/arm/freescale/vybrid/vf_dmamux.c
+++ b/sys/arm/freescale/vybrid/vf_dmamux.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/freescale/vybrid/vf_common.h>
 #include <arm/freescale/vybrid/vf_dmamux.h>
diff --git a/sys/arm/freescale/vybrid/vf_edma.c b/sys/arm/freescale/vybrid/vf_edma.c
index c5df919..91034fb 100644
--- a/sys/arm/freescale/vybrid/vf_edma.c
+++ b/sys/arm/freescale/vybrid/vf_edma.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/freescale/vybrid/vf_edma.h>
 #include <arm/freescale/vybrid/vf_dmamux.h>
diff --git a/sys/arm/freescale/vybrid/vf_gpio.c b/sys/arm/freescale/vybrid/vf_gpio.c
index a31ff78..0a7007d 100644
--- a/sys/arm/freescale/vybrid/vf_gpio.c
+++ b/sys/arm/freescale/vybrid/vf_gpio.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include "gpio_if.h"
 
diff --git a/sys/arm/freescale/vybrid/vf_i2c.c b/sys/arm/freescale/vybrid/vf_i2c.c
index 2eb6726..322eefa 100644
--- a/sys/arm/freescale/vybrid/vf_i2c.c
+++ b/sys/arm/freescale/vybrid/vf_i2c.c
@@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/freescale/vybrid/vf_common.h>
 
diff --git a/sys/arm/freescale/vybrid/vf_iomuxc.c b/sys/arm/freescale/vybrid/vf_iomuxc.c
index 8d8f7fd..f488592 100644
--- a/sys/arm/freescale/vybrid/vf_iomuxc.c
+++ b/sys/arm/freescale/vybrid/vf_iomuxc.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/freescale/vybrid/vf_iomuxc.h>
 #include <arm/freescale/vybrid/vf_common.h>
diff --git a/sys/arm/freescale/vybrid/vf_mscm.c b/sys/arm/freescale/vybrid/vf_mscm.c
index b07181e..60fc596 100644
--- a/sys/arm/freescale/vybrid/vf_mscm.c
+++ b/sys/arm/freescale/vybrid/vf_mscm.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/freescale/vybrid/vf_common.h>
 
diff --git a/sys/arm/freescale/vybrid/vf_port.c b/sys/arm/freescale/vybrid/vf_port.c
index 1cc83ed..edd20fd 100644
--- a/sys/arm/freescale/vybrid/vf_port.c
+++ b/sys/arm/freescale/vybrid/vf_port.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/freescale/vybrid/vf_port.h>
 #include <arm/freescale/vybrid/vf_common.h>
diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c
index 586055d..63ef65c 100644
--- a/sys/arm/freescale/vybrid/vf_sai.c
+++ b/sys/arm/freescale/vybrid/vf_sai.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/freescale/vybrid/vf_common.h>
 #include <arm/freescale/vybrid/vf_dmamux.h>
diff --git a/sys/arm/freescale/vybrid/vf_spi.c b/sys/arm/freescale/vybrid/vf_spi.c
index 222b96f..672ff37 100644
--- a/sys/arm/freescale/vybrid/vf_spi.c
+++ b/sys/arm/freescale/vybrid/vf_spi.c
@@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/freescale/vybrid/vf_common.h>
 
diff --git a/sys/arm/freescale/vybrid/vf_src.c b/sys/arm/freescale/vybrid/vf_src.c
index ac9b23b..45a2de4 100644
--- a/sys/arm/freescale/vybrid/vf_src.c
+++ b/sys/arm/freescale/vybrid/vf_src.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/freescale/vybrid/vf_src.h>
 #include <arm/freescale/vybrid/vf_common.h>
diff --git a/sys/arm/freescale/vybrid/vf_tcon.c b/sys/arm/freescale/vybrid/vf_tcon.c
index 2cc4a6a..934b4ad 100644
--- a/sys/arm/freescale/vybrid/vf_tcon.c
+++ b/sys/arm/freescale/vybrid/vf_tcon.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/freescale/vybrid/vf_common.h>
 
diff --git a/sys/arm/include/fdt.h b/sys/arm/include/fdt.h
index 9bd9332..9a93cb9 100644
--- a/sys/arm/include/fdt.h
+++ b/sys/arm/include/fdt.h
@@ -38,7 +38,7 @@
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 /* Max interrupt number */
 #define FDT_INTR_MAX	NIRQ
diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h
deleted file mode 100644
index 3509772..0000000
--- a/sys/arm/include/intr.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 	$NetBSD: intr.h,v 1.7 2003/06/16 20:01:00 thorpej Exp $	*/
-
-/*-
- * Copyright (c) 1997 Mark Brinicombe.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Mark Brinicombe
- *	for the NetBSD Project.
- * 4. The name of the company nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- *
- */
-
-#ifndef _MACHINE_INTR_H_
-#define _MACHINE_INTR_H_
-
-/* XXX move to std.* files? */
-#ifdef CPU_XSCALE_81342
-#define NIRQ		128
-#elif defined(CPU_XSCALE_PXA2X0)
-#include <arm/xscale/pxa/pxareg.h>
-#define	NIRQ		IRQ_GPIO_MAX
-#elif defined(SOC_MV_DISCOVERY)
-#define NIRQ		96
-#elif defined(CPU_ARM9) || defined(SOC_MV_KIRKWOOD) || \
-    defined(CPU_XSCALE_IXP435)
-#define NIRQ		64
-#elif defined(CPU_CORTEXA)
-#define NIRQ		1020
-#elif defined(CPU_KRAIT)
-#define NIRQ		288
-#elif defined(CPU_ARM1136) || defined(CPU_ARM1176)
-#define NIRQ		128
-#elif defined(SOC_MV_ARMADAXP)
-#define MAIN_IRQ_NUM		116
-#define ERR_IRQ_NUM		32
-#define ERR_IRQ			(MAIN_IRQ_NUM)
-#define MSI_IRQ_NUM		32
-#define MSI_IRQ			(ERR_IRQ + ERR_IRQ_NUM)
-#define NIRQ			(MAIN_IRQ_NUM + ERR_IRQ_NUM + MSI_IRQ_NUM)
-#else
-#define NIRQ		32
-#endif
-
-
-int arm_get_next_irq(int);
-void arm_mask_irq(uintptr_t);
-void arm_unmask_irq(uintptr_t);
-void arm_intrnames_init(void);
-void arm_setup_irqhandler(const char *, int (*)(void*), void (*)(void*),
-    void *, int, int, void **);
-int arm_remove_irqhandler(int, void *);
-extern void (*arm_post_filter)(void *);
-extern int (*arm_config_irq)(int irq, enum intr_trigger trig,
-    enum intr_polarity pol);
-
-void arm_irq_memory_barrier(uintptr_t);
-
-void gic_init_secondary(void);
-int  gic_decode_fdt(uint32_t iparentnode, uint32_t *intrcells, int *interrupt,
-    int *trig, int *pol);
-
-#endif	/* _MACHINE_INTR_H */
diff --git a/sys/arm/include/intr_machdep.h b/sys/arm/include/intr_machdep.h
new file mode 100644
index 0000000..3509772
--- /dev/null
+++ b/sys/arm/include/intr_machdep.h
@@ -0,0 +1,88 @@
+/* 	$NetBSD: intr.h,v 1.7 2003/06/16 20:01:00 thorpej Exp $	*/
+
+/*-
+ * Copyright (c) 1997 Mark Brinicombe.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Mark Brinicombe
+ *	for the NetBSD Project.
+ * 4. The name of the company nor the name of the author may be used to
+ *    endorse or promote products derived from this software without specific
+ *    prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ *
+ */
+
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
+
+/* XXX move to std.* files? */
+#ifdef CPU_XSCALE_81342
+#define NIRQ		128
+#elif defined(CPU_XSCALE_PXA2X0)
+#include <arm/xscale/pxa/pxareg.h>
+#define	NIRQ		IRQ_GPIO_MAX
+#elif defined(SOC_MV_DISCOVERY)
+#define NIRQ		96
+#elif defined(CPU_ARM9) || defined(SOC_MV_KIRKWOOD) || \
+    defined(CPU_XSCALE_IXP435)
+#define NIRQ		64
+#elif defined(CPU_CORTEXA)
+#define NIRQ		1020
+#elif defined(CPU_KRAIT)
+#define NIRQ		288
+#elif defined(CPU_ARM1136) || defined(CPU_ARM1176)
+#define NIRQ		128
+#elif defined(SOC_MV_ARMADAXP)
+#define MAIN_IRQ_NUM		116
+#define ERR_IRQ_NUM		32
+#define ERR_IRQ			(MAIN_IRQ_NUM)
+#define MSI_IRQ_NUM		32
+#define MSI_IRQ			(ERR_IRQ + ERR_IRQ_NUM)
+#define NIRQ			(MAIN_IRQ_NUM + ERR_IRQ_NUM + MSI_IRQ_NUM)
+#else
+#define NIRQ		32
+#endif
+
+
+int arm_get_next_irq(int);
+void arm_mask_irq(uintptr_t);
+void arm_unmask_irq(uintptr_t);
+void arm_intrnames_init(void);
+void arm_setup_irqhandler(const char *, int (*)(void*), void (*)(void*),
+    void *, int, int, void **);
+int arm_remove_irqhandler(int, void *);
+extern void (*arm_post_filter)(void *);
+extern int (*arm_config_irq)(int irq, enum intr_trigger trig,
+    enum intr_polarity pol);
+
+void arm_irq_memory_barrier(uintptr_t);
+
+void gic_init_secondary(void);
+int  gic_decode_fdt(uint32_t iparentnode, uint32_t *intrcells, int *interrupt,
+    int *trig, int *pol);
+
+#endif	/* _MACHINE_INTR_H */
diff --git a/sys/arm/lpc/if_lpe.c b/sys/arm/lpc/if_lpe.c
index 0ddd2a5..1d265d3 100644
--- a/sys/arm/lpc/if_lpe.c
+++ b/sys/arm/lpc/if_lpe.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/socket.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <net/if.h>
 #include <net/if_arp.h>
diff --git a/sys/arm/lpc/lpc_fb.c b/sys/arm/lpc/lpc_fb.c
index 5385d30..eef0c2b 100644
--- a/sys/arm/lpc/lpc_fb.c
+++ b/sys/arm/lpc/lpc_fb.c
@@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/lpc/lpc_gpio.c b/sys/arm/lpc/lpc_gpio.c
index d9536a7..0bed883 100644
--- a/sys/arm/lpc/lpc_gpio.c
+++ b/sys/arm/lpc/lpc_gpio.c
@@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <machine/fdt.h>
 
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/lpc/lpc_intc.c b/sys/arm/lpc/lpc_intc.c
index 3137e89..87ca3b5 100644
--- a/sys/arm/lpc/lpc_intc.c
+++ b/sys/arm/lpc/lpc_intc.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/timetc.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/lpc/lpc_mmc.c b/sys/arm/lpc/lpc_mmc.c
index 5dc6722..e2f20f5 100644
--- a/sys/arm/lpc/lpc_mmc.c
+++ b/sys/arm/lpc/lpc_mmc.c
@@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/lpc/lpc_pwr.c b/sys/arm/lpc/lpc_pwr.c
index 2b56e8c..da73ddd 100644
--- a/sys/arm/lpc/lpc_pwr.c
+++ b/sys/arm/lpc/lpc_pwr.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/rman.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/lpc/lpc_spi.c b/sys/arm/lpc/lpc_spi.c
index 5bf8f7d..42d1c6f 100644
--- a/sys/arm/lpc/lpc_spi.c
+++ b/sys/arm/lpc/lpc_spi.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/spibus/spi.h>
 #include <dev/spibus/spibusvar.h>
diff --git a/sys/arm/lpc/lpc_timer.c b/sys/arm/lpc/lpc_timer.c
index ded53fa..48e2c6f 100644
--- a/sys/arm/lpc/lpc_timer.c
+++ b/sys/arm/lpc/lpc_timer.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/timeet.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/mv/gpio.c b/sys/arm/mv/gpio.c
index 2e255aa..3a17a36 100644
--- a/sys/arm/mv/gpio.c
+++ b/sys/arm/mv/gpio.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/timetc.h>
 #include <machine/bus.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/mv/ic.c b/sys/arm/mv/ic.c
index 244b3fd..945a060 100644
--- a/sys/arm/mv/ic.c
+++ b/sys/arm/mv/ic.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/rman.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/mpic.c b/sys/arm/mv/mpic.c
index 813caf4..8a259be 100644
--- a/sys/arm/mv/mpic.c
+++ b/sys/arm/mv/mpic.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <machine/cpufunc.h>
 #include <machine/smp.h>
 
diff --git a/sys/arm/mv/mv_pci.c b/sys/arm/mv/mv_pci.c
index 012b31b..463ae01 100644
--- a/sys/arm/mv/mv_pci.c
+++ b/sys/arm/mv/mv_pci.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/endian.h>
 
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/arm/mv/orion/db88f5xxx.c b/sys/arm/mv/orion/db88f5xxx.c
index f59d511f..f7b47ae 100644
--- a/sys/arm/mv/orion/db88f5xxx.c
+++ b/sys/arm/mv/orion/db88f5xxx.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <machine/pte.h>
 #include <machine/vmparam.h>
 
diff --git a/sys/arm/mv/timer.c b/sys/arm/mv/timer.c
index ef8ce5f..35f0da2 100644
--- a/sys/arm/mv/timer.c
+++ b/sys/arm/mv/timer.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/mv/mvreg.h>
 #include <arm/mv/mvvar.h>
diff --git a/sys/arm/rockchip/rk30xx_gpio.c b/sys/arm/rockchip/rk30xx_gpio.c
index 5c7dc99..832fc97 100644
--- a/sys/arm/rockchip/rk30xx_gpio.c
+++ b/sys/arm/rockchip/rk30xx_gpio.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/rockchip/rk30xx_grf.c b/sys/arm/rockchip/rk30xx_grf.c
index 29da576..11a9c22 100644
--- a/sys/arm/rockchip/rk30xx_grf.c
+++ b/sys/arm/rockchip/rk30xx_grf.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/rockchip/rk30xx_mp.c b/sys/arm/rockchip/rk30xx_mp.c
index 54457a3..90a6a1c 100644
--- a/sys/arm/rockchip/rk30xx_mp.c
+++ b/sys/arm/rockchip/rk30xx_mp.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/smp.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #define	SCU_PHYSBASE			0x1013c000
 #define	SCU_SIZE			0x100
diff --git a/sys/arm/rockchip/rk30xx_pmu.c b/sys/arm/rockchip/rk30xx_pmu.c
index 517aef3..2a47917 100644
--- a/sys/arm/rockchip/rk30xx_pmu.c
+++ b/sys/arm/rockchip/rk30xx_pmu.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/samsung/exynos/chrome_ec.c b/sys/arm/samsung/exynos/chrome_ec.c
index 2c88414..2e470bf 100644
--- a/sys/arm/samsung/exynos/chrome_ec.c
+++ b/sys/arm/samsung/exynos/chrome_ec.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/iicbus/iiconf.h>
 
diff --git a/sys/arm/samsung/exynos/chrome_ec_spi.c b/sys/arm/samsung/exynos/chrome_ec_spi.c
index a018afa..e7cab58 100644
--- a/sys/arm/samsung/exynos/chrome_ec_spi.c
+++ b/sys/arm/samsung/exynos/chrome_ec_spi.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/spibus/spi.h>
 #include <dev/spibus/spibusvar.h>
diff --git a/sys/arm/samsung/exynos/chrome_kb.c b/sys/arm/samsung/exynos/chrome_kb.c
index b10a5ac..35e0fc6 100644
--- a/sys/arm/samsung/exynos/chrome_kb.c
+++ b/sys/arm/samsung/exynos/chrome_kb.c
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include "gpio_if.h"
 
diff --git a/sys/arm/samsung/exynos/exynos5_combiner.c b/sys/arm/samsung/exynos/exynos5_combiner.c
index ffd557e..ccb37d8 100644
--- a/sys/arm/samsung/exynos/exynos5_combiner.c
+++ b/sys/arm/samsung/exynos/exynos5_combiner.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/samsung/exynos/exynos5_common.h>
 #include <arm/samsung/exynos/exynos5_combiner.h>
diff --git a/sys/arm/samsung/exynos/exynos5_fimd.c b/sys/arm/samsung/exynos/exynos5_fimd.c
index 2a02074..1311a9a 100644
--- a/sys/arm/samsung/exynos/exynos5_fimd.c
+++ b/sys/arm/samsung/exynos/exynos5_fimd.c
@@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include "fb_if.h"
 
diff --git a/sys/arm/samsung/exynos/exynos5_i2c.c b/sys/arm/samsung/exynos/exynos5_i2c.c
index 294249a..8607910 100644
--- a/sys/arm/samsung/exynos/exynos5_i2c.c
+++ b/sys/arm/samsung/exynos/exynos5_i2c.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/samsung/exynos/exynos5_common.h>
 
diff --git a/sys/arm/samsung/exynos/exynos5_mct.c b/sys/arm/samsung/exynos/exynos5_mct.c
index 6f74a86..6e48a3a 100644
--- a/sys/arm/samsung/exynos/exynos5_mct.c
+++ b/sys/arm/samsung/exynos/exynos5_mct.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/samsung/exynos/exynos5_mp.c b/sys/arm/samsung/exynos/exynos5_mp.c
index aaeaf80..3ff33c4 100644
--- a/sys/arm/samsung/exynos/exynos5_mp.c
+++ b/sys/arm/samsung/exynos/exynos5_mp.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/smp.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #define	EXYNOS_CHIPID		0x10000000
 
diff --git a/sys/arm/samsung/exynos/exynos5_pad.c b/sys/arm/samsung/exynos/exynos5_pad.c
index c28ebb1..f8ba8e7 100644
--- a/sys/arm/samsung/exynos/exynos5_pad.c
+++ b/sys/arm/samsung/exynos/exynos5_pad.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include "gpio_if.h"
 
diff --git a/sys/arm/samsung/exynos/exynos5_pmu.c b/sys/arm/samsung/exynos/exynos5_pmu.c
index 92868e8..d370ba8 100644
--- a/sys/arm/samsung/exynos/exynos5_pmu.c
+++ b/sys/arm/samsung/exynos/exynos5_pmu.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/samsung/exynos/exynos5_common.h>
 #include <arm/samsung/exynos/exynos5_pmu.h>
diff --git a/sys/arm/samsung/exynos/exynos5_spi.c b/sys/arm/samsung/exynos/exynos5_spi.c
index 2a574b8..d6943f9 100644
--- a/sys/arm/samsung/exynos/exynos5_spi.c
+++ b/sys/arm/samsung/exynos/exynos5_spi.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/samsung/exynos/exynos5_common.h>
 
diff --git a/sys/arm/samsung/exynos/exynos5_usb_phy.c b/sys/arm/samsung/exynos/exynos5_usb_phy.c
index 2756efb..21f64e7 100644
--- a/sys/arm/samsung/exynos/exynos5_usb_phy.c
+++ b/sys/arm/samsung/exynos/exynos5_usb_phy.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/samsung/exynos/exynos5_common.h>
 #include <arm/samsung/exynos/exynos5_pmu.h>
diff --git a/sys/arm/samsung/exynos/exynos_uart.c b/sys/arm/samsung/exynos/exynos_uart.c
index 78bc085..8634b07 100644
--- a/sys/arm/samsung/exynos/exynos_uart.c
+++ b/sys/arm/samsung/exynos/exynos_uart.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/tty.h>
 #include <sys/rman.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
diff --git a/sys/arm/samsung/s3c2xx0/s3c24x0.c b/sys/arm/samsung/s3c2xx0/s3c24x0.c
index 49acdc6..0e62514 100644
--- a/sys/arm/samsung/s3c2xx0/s3c24x0.c
+++ b/sys/arm/samsung/s3c2xx0/s3c24x0.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 
 #include <machine/cpufunc.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <arm/samsung/s3c2xx0/s3c2410reg.h>
 #include <arm/samsung/s3c2xx0/s3c2440reg.h>
 #include <arm/samsung/s3c2xx0/s3c24x0var.h>
diff --git a/sys/arm/samsung/s3c2xx0/s3c24x0_clk.c b/sys/arm/samsung/s3c2xx0/s3c24x0_clk.c
index d4c4e98..c602ebe 100644
--- a/sys/arm/samsung/s3c2xx0/s3c24x0_clk.c
+++ b/sys/arm/samsung/s3c2xx0/s3c24x0_clk.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpufunc.h>
 #include <machine/frame.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <arm/samsung/s3c2xx0/s3c24x0reg.h>
 #include <arm/samsung/s3c2xx0/s3c24x0var.h>
 
diff --git a/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c b/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c
index 2ee1217..ec3a035 100644
--- a/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c
+++ b/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/tty.h>
 #include <sys/rman.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
diff --git a/sys/arm/ti/aintc.c b/sys/arm/ti/aintc.c
index 213a1d3..46b05b1 100644
--- a/sys/arm/ti/aintc.c
+++ b/sys/arm/ti/aintc.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/rman.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/ti/am335x/am335x_dmtimer.c b/sys/arm/ti/am335x/am335x_dmtimer.c
index 240a7a7..7f93efd 100644
--- a/sys/arm/ti/am335x/am335x_dmtimer.c
+++ b/sys/arm/ti/am335x/am335x_dmtimer.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include "opt_ntp.h"
 
diff --git a/sys/arm/ti/am335x/am335x_gpio.c b/sys/arm/ti/am335x/am335x_gpio.c
index 6aded04..627271f 100644
--- a/sys/arm/ti/am335x/am335x_gpio.c
+++ b/sys/arm/ti/am335x/am335x_gpio.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <sys/gpio.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/ti/am335x/am335x_lcd_syscons.c b/sys/arm/ti/am335x/am335x_lcd_syscons.c
index 12b6366..5eb7692 100644
--- a/sys/arm/ti/am335x/am335x_lcd_syscons.c
+++ b/sys/arm/ti/am335x/am335x_lcd_syscons.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/ti/am335x/am335x_prcm.c b/sys/arm/ti/am335x/am335x_prcm.c
index 7537a33..a6fdd55 100644
--- a/sys/arm/ti/am335x/am335x_prcm.c
+++ b/sys/arm/ti/am335x/am335x_prcm.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/ti/tivar.h>
 #include <arm/ti/ti_scm.h>
diff --git a/sys/arm/ti/am335x/am335x_scm_padconf.c b/sys/arm/ti/am335x/am335x_scm_padconf.c
index c5de872..143adb1 100644
--- a/sys/arm/ti/am335x/am335x_scm_padconf.c
+++ b/sys/arm/ti/am335x/am335x_scm_padconf.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <sys/gpio.h>
 
 #include <arm/ti/tivar.h>
diff --git a/sys/arm/ti/omap4/omap4_mp.c b/sys/arm/ti/omap4/omap4_mp.c
index 178db20..f309876 100644
--- a/sys/arm/ti/omap4/omap4_mp.c
+++ b/sys/arm/ti/omap4/omap4_mp.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/smp.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/ti/ti_smc.h>
 #include <arm/ti/omap4/omap4_smc.h>
diff --git a/sys/arm/ti/omap4/omap4_prcm_clks.c b/sys/arm/ti/omap4/omap4_prcm_clks.c
index 589f156..09b4abb 100644
--- a/sys/arm/ti/omap4/omap4_prcm_clks.c
+++ b/sys/arm/ti/omap4/omap4_prcm_clks.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/arm/mpcore_timervar.h>
 #include <arm/ti/tivar.h>
diff --git a/sys/arm/ti/omap4/omap4var.h b/sys/arm/ti/omap4/omap4var.h
index 8246e76..995ca73 100644
--- a/sys/arm/ti/omap4/omap4var.h
+++ b/sys/arm/ti/omap4/omap4var.h
@@ -47,7 +47,7 @@
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 
 void omap4_mask_all_intr(void);
diff --git a/sys/arm/ti/ti_cpuid.c b/sys/arm/ti/ti_cpuid.c
index 38af285..a396c30 100644
--- a/sys/arm/ti/ti_cpuid.c
+++ b/sys/arm/ti/ti_cpuid.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/ti/tivar.h>
 #include <arm/ti/ti_cpuid.h>
diff --git a/sys/arm/ti/ti_mbox.c b/sys/arm/ti/ti_mbox.c
index 994b0a0..0d1c155 100644
--- a/sys/arm/ti/ti_mbox.c
+++ b/sys/arm/ti/ti_mbox.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/ti/ti_prcm.c b/sys/arm/ti/ti_prcm.c
index 3c073f9..05db777 100644
--- a/sys/arm/ti/ti_prcm.c
+++ b/sys/arm/ti/ti_prcm.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/ti/ti_cpuid.h>
 #include <arm/ti/ti_prcm.h>
diff --git a/sys/arm/ti/ti_pruss.c b/sys/arm/ti/ti_pruss.c
index f7f7fbd..e74c542 100644
--- a/sys/arm/ti/ti_pruss.c
+++ b/sys/arm/ti/ti_pruss.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/ti/ti_sdhci.c b/sys/arm/ti/ti_sdhci.c
index 024c830..250843c 100644
--- a/sys/arm/ti/ti_sdhci.c
+++ b/sys/arm/ti/ti_sdhci.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/ti/ti_sdma.c b/sys/arm/ti/ti_sdma.c
index 4e9dbfe..92fa573 100644
--- a/sys/arm/ti/ti_sdma.c
+++ b/sys/arm/ti/ti_sdma.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/taskqueue.h>
 #include <sys/timetc.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/ti/ti_wdt.c b/sys/arm/ti/ti_wdt.c
index 7f50a61..a463d27 100644
--- a/sys/arm/ti/ti_wdt.c
+++ b/sys/arm/ti/ti_wdt.c
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/ti/twl/twl.c b/sys/arm/ti/twl/twl.c
index 387ca1b..547cf68 100644
--- a/sys/arm/ti/twl/twl.c
+++ b/sys/arm/ti/twl/twl.c
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/iicbus/iicbus.h>
 #include <dev/iicbus/iiconf.h>
diff --git a/sys/arm/ti/twl/twl_clks.c b/sys/arm/ti/twl/twl_clks.c
index a042e43..decf286 100644
--- a/sys/arm/ti/twl/twl_clks.c
+++ b/sys/arm/ti/twl/twl_clks.c
@@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/ti/twl/twl_vreg.c b/sys/arm/ti/twl/twl_vreg.c
index accbf49..11c12bd 100644
--- a/sys/arm/ti/twl/twl_vreg.c
+++ b/sys/arm/ti/twl/twl_vreg.c
@@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/versatile/pl050.c b/sys/arm/versatile/pl050.c
index ec26f2a..3679b3f 100644
--- a/sys/arm/versatile/pl050.c
+++ b/sys/arm/versatile/pl050.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/versatile/sp804.c b/sys/arm/versatile/sp804.c
index 5f986b1..fbefc4f 100644
--- a/sys/arm/versatile/sp804.c
+++ b/sys/arm/versatile/sp804.c
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/versatile/versatile_clcd.c b/sys/arm/versatile/versatile_clcd.c
index 804c24f..219aa56 100644
--- a/sys/arm/versatile/versatile_clcd.c
+++ b/sys/arm/versatile/versatile_clcd.c
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/versatile/versatile_pci.c b/sys/arm/versatile/versatile_pci.c
index 0e48496..93834a05 100644
--- a/sys/arm/versatile/versatile_pci.c
+++ b/sys/arm/versatile/versatile_pci.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/arm/versatile/versatile_sic.c b/sys/arm/versatile/versatile_sic.c
index 99ffb27..b26682f 100644
--- a/sys/arm/versatile/versatile_sic.c
+++ b/sys/arm/versatile/versatile_sic.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/rman.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/versatile/versatile_timer.c b/sys/arm/versatile/versatile_timer.c
index 5231ef1c..3f4815f 100644
--- a/sys/arm/versatile/versatile_timer.c
+++ b/sys/arm/versatile/versatile_timer.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/xilinx/zy7_mp.c b/sys/arm/xilinx/zy7_mp.c
index 831c4df..b869477 100644
--- a/sys/arm/xilinx/zy7_mp.c
+++ b/sys/arm/xilinx/zy7_mp.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/smp.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/xilinx/zy7_reg.h>
 
diff --git a/sys/arm/xscale/i80321/i80321.c b/sys/arm/xscale/i80321/i80321.c
index e65f38d..b79ebd4 100644
--- a/sys/arm/xscale/i80321/i80321.c
+++ b/sys/arm/xscale/i80321/i80321.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/xscale/i80321/i80321reg.h>
 #include <arm/xscale/i80321/i80321var.h>
diff --git a/sys/arm/xscale/i80321/i80321_timer.c b/sys/arm/xscale/i80321/i80321_timer.c
index 3b4e5a1..ede9a0b 100644
--- a/sys/arm/xscale/i80321/i80321_timer.c
+++ b/sys/arm/xscale/i80321/i80321_timer.c
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpufunc.h>
 #include <machine/frame.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <arm/xscale/i80321/i80321reg.h>
 #include <arm/xscale/i80321/i80321var.h>
 
diff --git a/sys/arm/xscale/i80321/iq80321.c b/sys/arm/xscale/i80321/iq80321.c
index fb34455..f265cfc 100644
--- a/sys/arm/xscale/i80321/iq80321.c
+++ b/sys/arm/xscale/i80321/iq80321.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <machine/armreg.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/xscale/i80321/i80321reg.h>
 #include <arm/xscale/i80321/i80321var.h>
diff --git a/sys/arm/xscale/i8134x/i81342.c b/sys/arm/xscale/i8134x/i81342.c
index 49d658a..ed48c7d 100644
--- a/sys/arm/xscale/i8134x/i81342.c
+++ b/sys/arm/xscale/i8134x/i81342.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <machine/armreg.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/xscale/i8134x/i81342reg.h>
 #include <arm/xscale/i8134x/i81342var.h>
diff --git a/sys/arm/xscale/ixp425/avila_ata.c b/sys/arm/xscale/ixp425/avila_ata.c
index e630714..02d3e1e 100644
--- a/sys/arm/xscale/ixp425/avila_ata.c
+++ b/sys/arm/xscale/ixp425/avila_ata.c
@@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <arm/xscale/ixp425/ixp425reg.h>
 #include <arm/xscale/ixp425/ixp425var.h>
 
diff --git a/sys/arm/xscale/ixp425/ixdp425_pci.c b/sys/arm/xscale/ixp425/ixdp425_pci.c
index 9fc3694..2d9bdf6 100644
--- a/sys/arm/xscale/ixp425/ixdp425_pci.c
+++ b/sys/arm/xscale/ixp425/ixdp425_pci.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcivar.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/xscale/ixp425/ixp425reg.h>
 #include <arm/xscale/ixp425/ixp425var.h>
diff --git a/sys/arm/xscale/ixp425/ixp425.c b/sys/arm/xscale/ixp425/ixp425.c
index 07c491a..c6a9030 100644
--- a/sys/arm/xscale/ixp425/ixp425.c
+++ b/sys/arm/xscale/ixp425/ixp425.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <machine/armreg.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/arm/xscale/ixp425/ixp425_npe.c b/sys/arm/xscale/ixp425/ixp425_npe.c
index 6dbce4c..8f7084f 100644
--- a/sys/arm/xscale/ixp425/ixp425_npe.c
+++ b/sys/arm/xscale/ixp425/ixp425_npe.c
@@ -95,7 +95,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <arm/xscale/ixp425/ixp425reg.h>
 #include <arm/xscale/ixp425/ixp425var.h>
 
diff --git a/sys/arm/xscale/ixp425/ixp425_qmgr.c b/sys/arm/xscale/ixp425/ixp425_qmgr.c
index cb6c8de..5556682 100644
--- a/sys/arm/xscale/ixp425/ixp425_qmgr.c
+++ b/sys/arm/xscale/ixp425/ixp425_qmgr.c
@@ -87,7 +87,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <arm/xscale/ixp425/ixp425reg.h>
 #include <arm/xscale/ixp425/ixp425var.h>
 
diff --git a/sys/arm/xscale/ixp425/ixp425_timer.c b/sys/arm/xscale/ixp425/ixp425_timer.c
index 6357c13..e4c06ac 100644
--- a/sys/arm/xscale/ixp425/ixp425_timer.c
+++ b/sys/arm/xscale/ixp425/ixp425_timer.c
@@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpufunc.h>
 #include <machine/frame.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <arm/xscale/ixp425/ixp425reg.h>
 #include <arm/xscale/ixp425/ixp425var.h>
 
diff --git a/sys/arm/xscale/ixp425/ixp425_wdog.c b/sys/arm/xscale/ixp425/ixp425_wdog.c
index 3e64fb3..f87c886 100644
--- a/sys/arm/xscale/ixp425/ixp425_wdog.c
+++ b/sys/arm/xscale/ixp425/ixp425_wdog.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/xscale/ixp425/ixp425reg.h>
 #include <arm/xscale/ixp425/ixp425var.h>
diff --git a/sys/arm/xscale/pxa/pxa_gpio.c b/sys/arm/xscale/pxa/pxa_gpio.c
index ecc220a..3fa0641 100644
--- a/sys/arm/xscale/pxa/pxa_gpio.c
+++ b/sys/arm/xscale/pxa/pxa_gpio.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/taskqueue.h>
 #include <sys/timetc.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/xscale/pxa/pxavar.h>
 #include <arm/xscale/pxa/pxareg.h>
diff --git a/sys/arm/xscale/pxa/pxa_icu.c b/sys/arm/xscale/pxa/pxa_icu.c
index 4194da3..3bfe670 100644
--- a/sys/arm/xscale/pxa/pxa_icu.c
+++ b/sys/arm/xscale/pxa/pxa_icu.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/timetc.h>
 #include <machine/armreg.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/xscale/pxa/pxavar.h>
 #include <arm/xscale/pxa/pxareg.h>
diff --git a/sys/arm/xscale/pxa/pxa_obio.c b/sys/arm/xscale/pxa/pxa_obio.c
index 8b35910..0f8f4f0 100644
--- a/sys/arm/xscale/pxa/pxa_obio.c
+++ b/sys/arm/xscale/pxa/pxa_obio.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/rman.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/xscale/pxa/pxavar.h>
 #include <arm/xscale/pxa/pxareg.h>
diff --git a/sys/arm/xscale/pxa/pxa_smi.c b/sys/arm/xscale/pxa/pxa_smi.c
index f25dac7..2278d37 100644
--- a/sys/arm/xscale/pxa/pxa_smi.c
+++ b/sys/arm/xscale/pxa/pxa_smi.c
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/timetc.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/arm/xscale/pxa/pxa_timer.c b/sys/arm/xscale/pxa/pxa_timer.c
index d62c1e1..72a9e23 100644
--- a/sys/arm/xscale/pxa/pxa_timer.c
+++ b/sys/arm/xscale/pxa/pxa_timer.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <arm/xscale/pxa/pxavar.h>
 #include <arm/xscale/pxa/pxareg.h>
-- 
2.1.0

