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.

diff --git a/sys/arm/allwinner/a10_gpio.c b/sys/arm/allwinner/a10_gpio.c
index e3e247e5881c67804cd130b58769096e5a796f97..a2ff43e6735cc7e8f6ac068b132f532fccb469f0 100644 (file)
--- a/sys/arm/allwinner/a10_gpio.c
+++ b/sys/arm/allwinner/a10_gpio.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 <dev/fdt/fdt_common.h>
 #include <dev/gpio/gpiobusvar.h>

diff --git a/sys/arm/allwinner/a10_sramc.c b/sys/arm/allwinner/a10_sramc.c
index a26afbb6154990d96879cbd64b235b6bcb4d83e3..894ed595b4bbd3b33f1a8d5f0aeecc02c8742236 100644 (file)
--- 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 <dev/fdt/fdt_common.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
index ed0345af59c0f5aabf79d05334ea4a098bae5622..790aaac37b65e975a8abe4f3c06160b542b1b261 100644 (file)
--- 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 9429aaf2b6d5dbd689dd9e4c4d498d93ab59b3b2..f2b566673e0942c0f7977c500af2b8270fde795e 100644 (file)
--- a/sys/arm/allwinner/a20/a20_mp.c
+++ b/sys/arm/allwinner/a20/a20_mp.c
@@ -39,7 +39,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 ed5f1fc5ec1768384e401e7a8a3addb04291ba69..1ace5bb09fe2d5886e3bb7d85d1568b3b1bbb932 100644 (file)
--- 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 18aeb8fc14ba82d64b211bfa46f270518249dc7c..9233ecb4c26529ebc17f3b47f79564998578d639 100644 (file)
--- 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 7c2a34063145abad0ca6f508215591605657083d..d6ea7c7c1fbe47a6d8c9bd730ec3459fef401089 100644 (file)
--- 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 3b63f79bbce5b683d1fad79080cf32255af15afc..e25b5393d6fde9b7c634a5e6e4fc1366055d50fe 100644 (file)
--- a/sys/arm/altera/socfpga/socfpga_manager.c
+++ b/sys/arm/altera/socfpga/socfpga_manager.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.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 24784e988814daebc2a10b97962e2188b997862c..8b9970da5cc26e8f60fcc3bc2e9ce0512ea23869 100644 (file)
--- a/sys/arm/altera/socfpga/socfpga_mp.c
+++ b/sys/arm/altera/socfpga/socfpga_mp.c
@@ -43,7 +43,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 36a1d755821015627b498670299a2a851164b7ea..7ad51cbf8d9b8801f232438e6eb2bfcbce5447fe 100644 (file)
--- 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 900fc418394220877d1642077ab18ced6cdd16c2..178ff81c5832f8c888b62b4198aad98e53afb81d 100644 (file)
--- a/sys/arm/arm/genassym.c
+++ b/sys/arm/arm/genassym.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpufunc.h>
 #include <machine/cpuinfo.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 636ba7502e686314d4a2ef4db511c92e745413fd..88f0406309ecab35e911352da95e5ee1ab596eb2 100644 (file)
--- a/sys/arm/arm/generic_timer.c
+++ b/sys/arm/arm/generic_timer.c
@@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #ifdef FDT
 #include <dev/fdt/fdt_common.h>

diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c
index 6fcb7e0822152ca5c2ac14693c7fc26476bfc1f0..94286a30f4b24488a4a53e8ad512beb16c120101 100644 (file)
--- 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 7ab87cc784eb15e77898b8e3886515642cac0816..0e537b034bea93c32b8f3a6db81395f028d87a2f 100644 (file)
--- a/sys/arm/arm/intr.c
+++ b/sys/arm/arm/intr.c
@@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/atomic.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 #include <machine/cpu.h>
 
 #ifdef FDT

diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index 1c422f3b7d8c8a0e142d5d1cf402cbf5bad44c82..17b718d946d52163d460fa1cd5434492694d7982 100644 (file)
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -97,7 +97,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpuinfo.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 083e62efb8f493adaf0053a3e1b07ad38a33147a..5555012ae408e5e4efddb99649c79de27075ba82 100644 (file)
--- a/sys/arm/arm/mp_machdep.c
+++ b/sys/arm/arm/mp_machdep.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/pmap.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 fb30d38f68a115ce9b879783ef6e9eb226c621e7..3c947c0ab1c7dbca7e6cc9afbbbe3b3977fa5b03 100644 (file)
--- 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 def6c1ad3cc4f64a456bb1159feeb2ee6ca78853..b8f32752f6f6fd8e871179b5dc74e979e5dcc401 100644 (file)
--- a/sys/arm/arm/nexus.c
+++ b/sys/arm/arm/nexus.c
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #ifdef FDT
 #include <machine/fdt.h>

diff --git a/sys/arm/arm/pl190.c b/sys/arm/arm/pl190.c
index 8cd744e6c993220c2a1fe61209c29a2a84c4f330..41a0bc34fa92045e55f42473b08fe5931ab5d65c 100644 (file)
--- 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 2fba6a8374160876a949fd02483457cf97035991..dea0fb0f6fe885456034df18325253b8d73c281d 100644 (file)
--- 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 8dcccc7714ad337905a82949a11854017fba9a64..585e63b724303fb2116a299efe5f88982bc33a74 100644 (file)
--- 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/at91/at91.c b/sys/arm/at91/at91.c
index 209a11997a158ed3d5c32a37bd93a0ac2c34c263..e25e450b0aa11f562f6ab2ae57c6b16ec53bdf9a 100644 (file)
--- 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 300c99aea3d31078643ef39354ae1899d276de65..c3d7bb0e56782633fdbe31b242b571f9b81c5db9 100644 (file)
--- 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 37ce434d67fbab800ace76a41e6f30864a91dc5e..c59a27a1fe8bf0e9ae6a1cfed5cae79eff3401b7 100644 (file)
--- 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 5d426cfe260a15afedded71335894b702b43ecda..960519c5d9bb2a55d771ebe1574578e350a5e292 100644 (file)
--- 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 a4b58ebc3295d39f1569d2904e267fb716094b5a..5ce119a0d0b20bedfd25c8040e23edea0ffb805f 100644 (file)
--- 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 13d5ff7f7479ea55ef2c2ee7e8bf8f9864a506ea..a49d1d83ddc3bfcc0281364e0bb92b7c62f6137f 100644 (file)
--- 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 a18be2e32239e60d4e38ed1eadfe82352a9f2925..b0b1001eae4b8788811d6544ffa366ab2729d924 100644 (file)
--- 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 a7acc31d43990a5bcd9fee84d994c09968137236..bfab79774333592934ca88c0fdefa8f69d037b01 100644 (file)
--- 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_intr.c b/sys/arm/broadcom/bcm2835/bcm2835_intr.c
index 45c2e97844d6d5291cd8357c83998a3de711e721..19d9d099d8ffc18af3555634a6a15e7fa5b665a9 100644 (file)
--- 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_spi.c b/sys/arm/broadcom/bcm2835/bcm2835_spi.c
index 99de5e7d6c38b837a4c58b0d3b0a732672003fbb..4f0895555dfd95b1c79ee092917bb2a2f75e6fb4 100644 (file)
--- a/sys/arm/broadcom/bcm2835/bcm2835_spi.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_spi.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 <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 731c7d069bd8350715c53c5f9fa252537724dd06..c87a643d9a099d6ea599ec9e47202d213e3d4af5 100644 (file)
--- 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 b9446f09606dfec6109a675737b67759f1caca45..d441de5a1fdfa1b7fd0c88e3aff606ecb84e78f5 100644 (file)
--- 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 20bc07e7167f3498e2895abb973a22c9c35ee815..539ca1cb1d1e424f752fcbe198d89ade14726458 100644 (file)
--- 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 e79a70ad0a44f50c0e1675863e780dd2319b5862..d1225265a74d98f9f6e4f660e8bc9462adc0f6f4 100644 (file)
--- 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 7a05d1e68306069e5d80e7e5332cd3c8e33e77b8..028d748d4e12141f95e8a65301980c4c2b002a1f 100644 (file)
--- 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 3da87a911d8dfa7a6138f38f53a13ccda4f31c36..eb67aa8638f0c8442a84176e7041e48906f9531d 100644 (file)
--- a/sys/arm/freescale/imx/imx51_ipuv3.c
+++ b/sys/arm/freescale/imx/imx51_ipuv3.c
@@ -61,7 +61,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 385275422cc034389fecc1241794ee63d6bb545e..b489c0a78a96c2d9e1e6529fd2b17f7ef029130f 100644 (file)
--- a/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
+++ b/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
@@ -59,7 +59,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 <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 2322cffab0d5b7a589d813ec5a43f2c1c8bbd005..ecbc42b938e38adc3c558ad86e3fcdec2aa070e7 100644 (file)
--- 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/platformvar.h>
 

diff --git a/sys/arm/freescale/imx/imx6_mp.c b/sys/arm/freescale/imx/imx6_mp.c
index b02588cfa22f419582c54d334561f910049ce062..a8f967e1a2fb82102d442742059c62563c0a0ba4 100644 (file)
--- a/sys/arm/freescale/imx/imx6_mp.c
+++ b/sys/arm/freescale/imx/imx6_mp.c
@@ -39,7 +39,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 8da0b2e0791f23d98c1f6c2b0594e68faf3c8e41..2e1b9b002abe5cb746223731f20f86ec99bd4007 100644 (file)
--- 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 <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>

diff --git a/sys/arm/freescale/imx/imx_sdhci.c b/sys/arm/freescale/imx/imx_sdhci.c
index 290a0317e0ddb51fcd8ae02a77c77c9ea3f77149..595e1d244de3995edefbb526e1b6c38bdb4f534d 100644 (file)
--- 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 cbf9343b1c60503afefd1728663da04244128fc9..6e385ad30053fe3f4a4ffd76b9c895ed3ad3d131 100644 (file)
--- 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 0f3cf5cc075f2fb92c2cdeb153dc0858189894f6..ddad0e489fa3637bf4efcba113309c5a9f824b67 100644 (file)
--- 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 0a806fb96c7d90d206a8d5ad923b5396bb5bfcf2..6415c1bb891f023317be6ab98391683abfd78458 100644 (file)
--- a/sys/arm/freescale/vybrid/vf_adc.c
+++ b/sys/arm/freescale/vybrid/vf_adc.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/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 3a2cbc4e4811c6304e8a1352a7c519c7fd1f1e0b..06e9c5bca9888d180100b343a14c101b07efde9e 100644 (file)
--- a/sys/arm/freescale/vybrid/vf_anadig.c
+++ b/sys/arm/freescale/vybrid/vf_anadig.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.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 8f8a3f03de841002a58d4ad08ef2ccac77b0ad93..aec8b3fbc27fb4c4d06b02662b5476d3170f7b47 100644 (file)
--- a/sys/arm/freescale/vybrid/vf_ccm.c
+++ b/sys/arm/freescale/vybrid/vf_ccm.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.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 34dea4600a960046ef79ff3b7bff27b7fbf920ea..a213ecc8de9fc37624add888d78c732c686de412 100644 (file)
--- a/sys/arm/freescale/vybrid/vf_dcu4.c
+++ b/sys/arm/freescale/vybrid/vf_dcu4.c
@@ -63,7 +63,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 a887ffa16d997d9b9a03b06f44f561b9ed8f0646..77c4c693ca1b36638dfde75d16ae511e05b7c6dd 100644 (file)
--- a/sys/arm/freescale/vybrid/vf_dmamux.c
+++ b/sys/arm/freescale/vybrid/vf_dmamux.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.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 ed12072fa6cbc8b27aa26d037f26908339fcde9c..47810dd1ffa84020e3a0e435097e06ac9f44b413 100644 (file)
--- a/sys/arm/freescale/vybrid/vf_edma.c
+++ b/sys/arm/freescale/vybrid/vf_edma.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.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 0c1cf82303d823987eb476d27096e443abbe2649..8e3749afc6d277e330509849b771fd668e202c0b 100644 (file)
--- 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/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 c554ce2e2686d534847562d70dce652c765e3d61..bcdf5a2ea615a6fe374a0596fc988f4bc8aee17b 100644 (file)
--- a/sys/arm/freescale/vybrid/vf_i2c.c
+++ b/sys/arm/freescale/vybrid/vf_i2c.c
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.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 95711d67647698a1696898517634a3e35eca4973..18584bda013b6895d152d09b44a22d08baf56cc0 100644 (file)
--- a/sys/arm/freescale/vybrid/vf_iomuxc.c
+++ b/sys/arm/freescale/vybrid/vf_iomuxc.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.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 02850e58936f2e24b1c4ffbc64539714d78bf12f..ad12547ca310071436f001542198495bb5cc614f 100644 (file)
--- a/sys/arm/freescale/vybrid/vf_mscm.c
+++ b/sys/arm/freescale/vybrid/vf_mscm.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.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 943ca8861370d80114906d3c74b01889ba3e018a..8ca62d33bdaf5d179fbffbf583ca3119cce2c95a 100644 (file)
--- a/sys/arm/freescale/vybrid/vf_port.c
+++ b/sys/arm/freescale/vybrid/vf_port.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.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 309d95e5dcb85345ba9b24bc8e7579d1ba4bd8f4..828a794484692f888c6a4fd374666b08e9b69d02 100644 (file)
--- a/sys/arm/freescale/vybrid/vf_sai.c
+++ b/sys/arm/freescale/vybrid/vf_sai.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.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 8fa466bf83bcf738e51906f72a2360c50af15c8c..5915acfed38c3ed5d19e8bbe15386a16a3a02e70 100644 (file)
--- a/sys/arm/freescale/vybrid/vf_spi.c
+++ b/sys/arm/freescale/vybrid/vf_spi.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.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 83d7e969e09d610bef47317d828f377316d86b06..aed6770e635b57af528c2c0e03d38c67278b9e2c 100644 (file)
--- a/sys/arm/freescale/vybrid/vf_src.c
+++ b/sys/arm/freescale/vybrid/vf_src.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.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 31f85b58b4647740d043b4bd6f85d20dfc62d1d0..01240b598ff99fb30065f079b3519b4e0d850ac5 100644 (file)
--- a/sys/arm/freescale/vybrid/vf_tcon.c
+++ b/sys/arm/freescale/vybrid/vf_tcon.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.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/intr.h b/sys/arm/include/intr.h
deleted file mode 100644 (file)
index 7ab69d9..0000000
--- a/sys/arm/include/intr.h
+++ /dev/null
@@ -1,96 +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_
-
-#ifdef FDT
-#include <dev/ofw/openfirm.h>
-#endif
-
-/* 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_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 arm_init_secondary_ic(void);
-int  gic_decode_fdt(uint32_t iparentnode, uint32_t *intrcells, int *interrupt,
-    int *trig, int *pol);
-
-#ifdef FDT
-int arm_fdt_map_irq(phandle_t, pcell_t *, int);
-#endif
-
-#endif /* _MACHINE_INTR_H */

diff --git a/sys/arm/include/intr_machdep.h b/sys/arm/include/intr_machdep.h
new file mode 100644 (file)
index 0000000..7ab69d9
--- /dev/null
+++ b/sys/arm/include/intr_machdep.h
@@ -0,0 +1,96 @@
+/*     $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_
+
+#ifdef FDT
+#include <dev/ofw/openfirm.h>
+#endif
+
+/* 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_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 arm_init_secondary_ic(void);
+int  gic_decode_fdt(uint32_t iparentnode, uint32_t *intrcells, int *interrupt,
+    int *trig, int *pol);
+
+#ifdef FDT
+int arm_fdt_map_irq(phandle_t, pcell_t *, int);
+#endif
+
+#endif /* _MACHINE_INTR_H */

diff --git a/sys/arm/lpc/if_lpe.c b/sys/arm/lpc/if_lpe.c
index 0ddd2a5a33b213261b4df469978ef3c5193bfd92..1d265d37fe84b18b7c559d7c015bb2b0b0051c6d 100644 (file)
--- 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 5385d30bee6f484e9296db9817eb70f8d53a2334..eef0c2b0c981600287388fc4006401b4ccde6e4e 100644 (file)
--- 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 88f37b6cbf57d8a87191ccc6b6bad664a658d42f..502d3d37c6a6411459aceb9719970877777d2eab 100644 (file)
--- 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/gpio/gpiobusvar.h>

diff --git a/sys/arm/lpc/lpc_intc.c b/sys/arm/lpc/lpc_intc.c
index bf26645d742c2c1a460b908426831e2a2407cce5..0ad164d3cd0251a989967df352ed5c758fc1d156 100644 (file)
--- 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 5dc6722b48b24ec053e0931ae7b23cf0380fdec7..e2f20f5d236e66c1adc934b6549a7b0bc42b683a 100644 (file)
--- 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 2b56e8cf644482ad13d8c42dcc8b3f5a6d8b5830..da73ddd653326a88df4560cc4a969e4f737be94d 100644 (file)
--- 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 5bf8f7dad1bea522a18b3a79bd1bd712d5befdda..42d1c6facbe5490d88c90390e70e4436b6bd7942 100644 (file)
--- 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 ded53fa9931dd1cfcff5b1c50f93b8d7e854d196..48e2c6f8e2de72e0ce7e7dd0008f37f315d8cc91 100644 (file)
--- 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 79b7cc622a1cf6fee503ac038f73b619df1207a8..de2a4894584e2f77fd1eb9bbfd984d561ad1a5a1 100644 (file)
--- a/sys/arm/mv/gpio.c
+++ b/sys/arm/mv/gpio.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/queue.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/ofw_bus.h>

diff --git a/sys/arm/mv/ic.c b/sys/arm/mv/ic.c
index 244b3fd5474865cda52d83fd8e0c62168efda3b1..945a06050f6b2c43ea88efec0a2bcde953820646 100644 (file)
--- 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 7eb5d2a022b0de11f5b66140e2bb082e460fac6a..ccd627ce93a42c395829430fbf169bbc1c449a7a 100644 (file)
--- 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 42f9218ee81d21e757bc2a9b98a19c7079b730ea..67a560cb7f43d122b4d5ac509fdbb3bf92d4f0b2 100644 (file)
--- 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 f59d511f4d098608f30d3746c2294d24ca512499..f7b47aea4a55d94f1859997257cec224f922022c 100644 (file)
--- 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 ef8ce5f23ad3a22a37f1c8103895b3baaeca6ed6..35f0da29c850b964a20d069f1fe21f9a40091c12 100644 (file)
--- 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 2c95fb97a09299d5c0baaeb36f6e71b52617cbc3..a81daf6347c7f7343e48e50a56021dde66a160c9 100644 (file)
--- a/sys/arm/rockchip/rk30xx_gpio.c
+++ b/sys/arm/rockchip/rk30xx_gpio.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 <dev/fdt/fdt_common.h>
 #include <dev/gpio/gpiobusvar.h>

diff --git a/sys/arm/rockchip/rk30xx_grf.c b/sys/arm/rockchip/rk30xx_grf.c
index ce61e8c4e5fd3ee0545514fe0ef7fd55506d9396..fc895bb7b4469f9924207db06e667d004971129f 100644 (file)
--- 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 74c8b554c85c34729159a95eebccb8cf11a8a81f..8eff7a9e9221e0c4dadd70a790064c18fda427b4 100644 (file)
--- a/sys/arm/rockchip/rk30xx_mp.c
+++ b/sys/arm/rockchip/rk30xx_mp.c
@@ -38,7 +38,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 514e961d0d130fe3e29e94a5bbc580f4e3aa43c6..9568497343b36a784ecbf7ba5410aa0a34bc1e35 100644 (file)
--- 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 2c88414d2d35888e188f6f4b271415279c6c01c5..2e470bf6840ac985d606b723881d931c245b8bd4 100644 (file)
--- 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 a018afae9d244c3f0679054c2f1de990c311e26b..e7cab584d6c4171556403f430afd4c980c58228b 100644 (file)
--- 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 b10a5ac8b187056b8eb1aed2b08c86e9d6bbf37a..35e0fc6089a082a5ea577dac419ab62441badfab 100644 (file)
--- 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 ffd557e3866b7982230699218f5cfcf8b1885ca2..ccb37d85d26029ed276d922d47589f2223fcf8d3 100644 (file)
--- 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 2a02074ec1f17f6d5fc4aa9b3e3f98a6cb2944d1..1311a9a80b4324ed23b54f6ec51a3b8926b021ff 100644 (file)
--- 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 294249a5a354af7fa766c1459ba87961a6eee1da..8607910b01670786163ac7475b76227bd3918c25 100644 (file)
--- 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 6f74a862bb964fd84a4bf125b0541d61c52ab5dc..6e48a3adbf0eab1faa49d618fbe801132cfffc27 100644 (file)
--- 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 1b3afbbf0d6d10629da38ffe1fc27b4d687814f0..7b446b8eaa307a3d0c16cc8fdfdb7496fef9d99e 100644 (file)
--- a/sys/arm/samsung/exynos/exynos5_mp.c
+++ b/sys/arm/samsung/exynos/exynos5_mp.c
@@ -38,7 +38,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 19fa583ced5a56229e54146a89f7b1b2cd8866df..76db03ef0ae63a60f0fbaa745a0f872d0f83df7f 100644 (file)
--- a/sys/arm/samsung/exynos/exynos5_pad.c
+++ b/sys/arm/samsung/exynos/exynos5_pad.c
@@ -52,7 +52,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 92868e8c0dde236de3bdc7b91e6ca75972a27282..d370ba80ede5ff50e12226aabff21bdf15c3bfc1 100644 (file)
--- 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 2a574b884e4a94fe8fd7acc1de83616265ae2b23..d6943f9f8dc432e72b8ad7530df9814e4d9147c1 100644 (file)
--- 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 2756efbc337c469d26f0decfd424e0f803600c0b..21f64e764651de22052d3c77f362fabb88dfcbf0 100644 (file)
--- 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 7b372dedf87fc993053f3e4ea5dc18bc7ffcd642..ff001d59e52f6e6ca95410920d933ff69b4ba3ad 100644 (file)
--- 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 845651fd846b7ccb19f0c3e43bac9c906b153770..7e015f84563c90befdf01c1d75f2e15cc480e1a5 100644 (file)
--- 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 d4c4e984f7f9006a3d61ac558ee9f64ced75a1eb..c602ebe450cab66d6a298b778711ad1db6231659 100644 (file)
--- 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 cc0d59acdd2446510df0ec5ac7bd30fb33ed896e..bfedf9d02df6895516917de1dd3eb66424ca97ac 100644 (file)
--- 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 fe4172337854e073625e6f886cd007e97a0d229b..124adafac272e1472e0cd840c530396c1749a243 100644 (file)
--- 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_gpio.c b/sys/arm/ti/am335x/am335x_gpio.c
index a635c3733b1553b0eb19df9a55a26d8a727673b3..a7717b75ef7e6b88b095710b8c247bd76e99198b 100644 (file)
--- 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 12b6366e96fb749f0cca3a7e31cbe8cb6b7982f1..5eb76920a2c102396a70660d27c1e36b0cc5910d 100644 (file)
--- 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 8a6476d3c2deb52b1bb788093b9a712d76fb34e5..04fa615142bbbca1a5a9a6c32ac51ea05c69d289 100644 (file)
--- 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 a95c8cb1462db31577e9ab3dabbf060042cb166a..2df6286ef5052937691114342c1175091b71d938 100644 (file)
--- 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 6423e568f24a00a7bea409b004cebebc2fe17eae..7cbc8900df8efa7a9cc0c0beb8724cf116df004f 100644 (file)
--- a/sys/arm/ti/omap4/omap4_mp.c
+++ b/sys/arm/ti/omap4/omap4_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>
 
 #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 fc5fb975b76e83d1e861abf47c165f8eff767585..42d89fe9594f622815557c0d9d79c742c8ab370f 100644 (file)
--- 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/ti_cpuid.c b/sys/arm/ti/ti_cpuid.c
index 38af285c1abd0ea4dc658e69b66ac5fe60c29c9d..a396c302593b1f26959b5e8a5042641368cf27a0 100644 (file)
--- 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 9729ed40fc4a9570e3a660b315fbd0890801d736..49cd955323eccf6c02a2f364928651d0f4734601 100644 (file)
--- 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 c5ab9c720a4390c949e9cbb56b1858e688706223..5fcc9917bea9610cdaf0018c14e14641d92436a9 100644 (file)
--- 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 94cea60a7fa828772e98c65bfc79fee8b907c066..8c2f450282eff7b0b0157894a8d11f9f0fd67159 100644 (file)
--- 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 bc0880dff1e68470a2b9a924893f17c42e3b5cff..3e0af97af6219cffdd12e6986397d9db469ec5dc 100644 (file)
--- 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 a8faba8949e1ac78458e9cc04b0408f963111481..448dea1847428097bd9400bb077cd1e361b87b7d 100644 (file)
--- 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 2b51cc2d1384aeaa8800eb50c9286c137fa77135..19bd786ab0fc404de4a52719988c45ad8d7f4d33 100644 (file)
--- 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 387ca1be539a32f4416fd0097d4a76933c539493..547cf686ceb7bfe3620b0be76a1bbd682f72ffa6 100644 (file)
--- 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 a042e4323c31a7eca5ef4eae55d8ffa2f9f22096..decf2860695ac2dc8087af7440ced5b7434cce7d 100644 (file)
--- 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 accbf49cc1f46401b4012e37038d1ae9e5d672a1..11c12bd762edb5082ff1de3587169920aca50ea9 100644 (file)
--- 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 c5d8a61372c13490993aa84449c0c4c9b9827c7e..149c37ef9c98d730dea00404c70b47d0fae8d7c9 100644 (file)
--- 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 de05700dd1c6b7891d400c6486d2e1c2e7a37ac2..4e4bcd4c27585e4c849a53057e56e667af8f1787 100644 (file)
--- 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 76c6c63d8c508f66e87656d9cc6fe08927d5b2f8..d57123ae080b8e4f4c7c922a5f958752a88be221 100644 (file)
--- 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 f5ef6e94ec2c6fee9e8c33d16315398a7dd644d7..9dde3f2c6eeaa768fa6cee37d6fcbd06200bae54 100644 (file)
--- a/sys/arm/versatile/versatile_pci.c
+++ b/sys/arm/versatile/versatile_pci.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 
 #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 99ffb27a72d6401b97171d382a2d0b793ec79895..b26682f34f9baa30e6e9eb5bf430ee32c911a64e 100644 (file)
--- 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 c5f6def30c632f4f7d2d1f648a9dfd5774e2f8da..41cbd36bef6ab9d121cce62cff0946a74ac31183 100644 (file)
--- 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 305290ed20342e8db1e91aafd6a82d1a75dd57ce..dc012ea28e9fd9791d354eb03c5d6663ddb3f78d 100644 (file)
--- a/sys/arm/xilinx/zy7_mp.c
+++ b/sys/arm/xilinx/zy7_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>
 
 #include <arm/xilinx/zy7_reg.h>
 

diff --git a/sys/arm/xscale/i80321/i80321.c b/sys/arm/xscale/i80321/i80321.c
index e65f38df5873e237198ba3fa1fb2100864278faf..b79ebd437897054ec2fa97649d64ae0558a32975 100644 (file)
--- 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 3b4e5a11b552c894a3ec297ca4e0070b5462cd2c..ede9a0b75c478af222056a9ae56f1cd646b46dd2 100644 (file)
--- 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 fb344556ccb0b6af7f3042cb0208ab4401f7c8e1..f265cfce3b39d4db91e03c48db05d1387e6e140f 100644 (file)
--- 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 49d658ae2d533c5c72a74e326dcd65c5ad82976a..ed48c7d5dfcd6fa5fa5a4446a5cc718363403a40 100644 (file)
--- 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 217cfc8d405d2dd86fdd4d475571a1e101cf3fbc..0ace0ae06f51479818fc620d2c52eeb784a6be43 100644 (file)
--- 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 9fc3694d371cec688b9180fe8719d9110d50f996..2d9bdf6f2214d6b6d67700c724307b5a49375f2a 100644 (file)
--- 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 07c491aa573fa4599906dcd30af75c43060294eb..c6a90303e7e8f3f3f78267486aeaccf2bc067a3e 100644 (file)
--- 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 6dbce4ccb9548b95a63804a8e9bef9487434243c..8f7084f1e57682ee75cae5090a81b45f05f637be 100644 (file)
--- 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 cb6c8defc948a87acd130f254cf4c0309d92e3e5..5556682d327717b05e692c846cb0bc62e7ea22dd 100644 (file)
--- 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 6357c138566420c4564851b726d63aaab5069f28..e4c06ac4813b2b27efc67f62de7b27eb5b220c09 100644 (file)
--- 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 3e64fb39c48494c65680699c85fb37a44216bd69..f87c8868651e37914667b5ace481fe91ef80efa9 100644 (file)
--- 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 ecc220ae55defc6abf4e3ec248bab0b23e4f62d6..3fa06414e250bf4475f3b58a431c99db728307a7 100644 (file)
--- 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 4194da3c036ba454facd5efbfb1af996c8208f85..3bfe670fc80de71e9a545db6ab82abc9e6cab9fc 100644 (file)
--- 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 8b3591093ad3056f9ebbe99bec59f9683c6899ad..0f8f4f03c1f4f9754767394a614b91e6485e4870 100644 (file)
--- 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 f25dac771234e76c1ea8fa0e9e88c31fa34fec44..2278d37c8748af6186eb44d53f95daffb26de10a 100644 (file)
--- 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 d62c1e1edbc4470ccc1fa53f652d6914cc888930..72a9e23f332f3ebb0eb753b64c479649521b52d9 100644 (file)
--- 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>