Rename ARM_INTRNG and MIPS_INTRNG to INTRNG. This will help with machine

independent code that needs to know about INTRNG such as PCI drivers.

Obtained from:	ABT Systems Ltd
Sponsored by:	The FreeBSD Foundation

5 files changed, 17 insertions, 17 deletions

diff --git a/sys/mips/include/intr.h b/sys/mips/include/intr.h
index e7258fe..6e00643 100644
--- a/sys/mips/include/intr.h
+++ b/sys/mips/include/intr.h
@@ -39,7 +39,7 @@
 #ifndef _MACHINE_INTR_H_
 #define _MACHINE_INTR_H_
 
-#ifdef MIPS_INTRNG
+#ifdef INTRNG
 
 #ifdef FDT
 #include <dev/ofw/openfirm.h>
@@ -66,6 +66,6 @@ void cpu_establish_softintr(const char *, driver_filter_t *, void (*)(void*),
 /* MIPS interrupt C entry point */
 void cpu_intr(struct trapframe *);
 
-#endif /* MIPS_INTRNG */
+#endif /* INTRNG */
 
 #endif	/* _MACHINE_INTR_H */
diff --git a/sys/mips/include/smp.h b/sys/mips/include/smp.h
index fa4cb5c..d7a33de 100644
--- a/sys/mips/include/smp.h
+++ b/sys/mips/include/smp.h
@@ -21,7 +21,7 @@
 
 #include <machine/pcb.h>
 
-#ifdef MIPS_INTRNG
+#ifdef INTRNG
 # define MIPS_IPI_COUNT 	1
 # define INTR_IPI_COUNT 	MIPS_IPI_COUNT
 #endif
diff --git a/sys/mips/mips/exception.S b/sys/mips/mips/exception.S
index ebfd84d..ed02e5a 100644
--- a/sys/mips/mips/exception.S
+++ b/sys/mips/mips/exception.S
@@ -646,7 +646,7 @@ NESTED_NOPROFILE(MipsKernIntr, KERN_EXC_FRAME_SIZE, ra)
  *  Call the interrupt handler. a0 points at the saved frame.
  */
 	PTR_LA	gp, _C_LABEL(_gp)
-#ifdef MIPS_INTRNG
+#ifdef INTRNG
 	PTR_LA	k0, _C_LABEL(intr_irq_handler)
 #else
 	PTR_LA	k0, _C_LABEL(cpu_intr)
@@ -762,7 +762,7 @@ NESTED_NOPROFILE(MipsUserIntr, CALLFRAME_SIZ, ra)
 /*
  * Call the interrupt handler.
  */
-#ifdef MIPS_INTRNG
+#ifdef INTRNG
 	PTR_LA	k0, _C_LABEL(intr_irq_handler)
 #else
 	PTR_LA	k0, _C_LABEL(cpu_intr)
@@ -1198,7 +1198,7 @@ FPReturn:
 	PTR_ADDU sp, sp, CALLFRAME_SIZ
 END(MipsFPTrap)
 
-#ifndef MIPS_INTRNG
+#ifndef INTRNG
 /*
  * Interrupt counters for vmstat.
  */
@@ -1225,7 +1225,7 @@ sintrcnt:
 #else
 	.int  INTRCNT_COUNT * (_MIPS_SZLONG / 8) * 2
 #endif
-#endif /* MIPS_INTRNG */
+#endif /* INTRNG */
 
 
 /*
diff --git a/sys/mips/mips/nexus.c b/sys/mips/mips/nexus.c
index 908d5bc..45e47ef 100644
--- a/sys/mips/mips/nexus.c
+++ b/sys/mips/mips/nexus.c
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <machine/vmparam.h>
 
-#ifdef MIPS_INTRNG
+#ifdef INTRNG
 #include <machine/intr.h>
 #else
 #include <machine/intr_machdep.h>
@@ -115,7 +115,7 @@ static int	nexus_setup_intr(device_t dev, device_t child,
 		    driver_intr_t *intr, void *arg, void **cookiep);
 static int	nexus_teardown_intr(device_t, device_t, struct resource *,
 		    void *);
-#ifdef MIPS_INTRNG
+#ifdef INTRNG
 #ifdef SMP
 static int	nexus_bind_intr(device_t, device_t, struct resource *, int);
 #endif
@@ -148,7 +148,7 @@ static device_method_t nexus_methods[] = {
 	DEVMETHOD(bus_activate_resource,nexus_activate_resource),
 	DEVMETHOD(bus_deactivate_resource,	nexus_deactivate_resource),
 	DEVMETHOD(bus_hinted_child,	nexus_hinted_child),
-#ifdef MIPS_INTRNG
+#ifdef INTRNG
 	DEVMETHOD(bus_config_intr,	nexus_config_intr),
 	DEVMETHOD(bus_describe_intr,	nexus_describe_intr),
 #ifdef SMP
@@ -458,7 +458,7 @@ nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags,
     driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep)
 {
 
-#ifdef MIPS_INTRNG
+#ifdef INTRNG
 	return (intr_setup_irq(child, res, filt, intr, arg, flags, cookiep));
 #else
 	int irq;
@@ -483,7 +483,7 @@ static int
 nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih)
 {
 
-#ifdef MIPS_INTRNG
+#ifdef INTRNG
 	return (intr_teardown_irq(child, r, ih));
 #else
 	printf("Unimplemented %s at %s:%d\n", __func__, __FILE__, __LINE__);
@@ -491,7 +491,7 @@ nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih)
 #endif
 }
 
-#ifdef MIPS_INTRNG
+#ifdef INTRNG
 static int
 nexus_config_intr(device_t dev, int irq, enum intr_trigger trig,
     enum intr_polarity pol)
@@ -527,7 +527,7 @@ nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, int icells,
 	return (intr_fdt_map_irq(iparent, intr, icells));
 }
 #endif
-#endif /* MIPS_INTRNG */
+#endif /* INTRNG */
 
 static void
 nexus_hinted_child(device_t bus, const char *dname, int dunit)
diff --git a/sys/mips/mips/tick.c b/sys/mips/mips/tick.c
index b146ad7..8bcc534 100644
--- a/sys/mips/mips/tick.c
+++ b/sys/mips/mips/tick.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/locore.h>
 #include <machine/md_var.h>
 
-#ifdef MIPS_INTRNG
+#ifdef INTRNG
 #include <machine/intr.h>
 #endif
 
@@ -328,7 +328,7 @@ static int
 clock_attach(device_t dev)
 {
 	struct clock_softc *sc;
-#ifndef MIPS_INTRNG
+#ifndef INTRNG
 	int error;
 #endif
 
@@ -336,7 +336,7 @@ clock_attach(device_t dev)
 		panic("can't attach more clocks");
 
 	softc = sc = device_get_softc(dev);
-#ifdef MIPS_INTRNG
+#ifdef INTRNG
 	cpu_establish_hardintr("clock", clock_intr, NULL, sc, 5, INTR_TYPE_CLK,
 	    NULL);
 #else