Rename arm_init_secondary_ic() -> arm_pic_init_secondary(). The latter is

the name the function will have when the new ARM_INTRNG code is integrated,
and doing this rename first will make it easier to toggle the new interrupt
handling code on/off with a config option for debugging.

diff --git a/sys/arm/allwinner/a20/a20_mp.c b/sys/arm/allwinner/a20/a20_mp.c
index 9429aaf2b6d5dbd689dd9e4c4d498d93ab59b3b2..4beac42481f149524e5888df4a98ee08d45833ec 100644 (file)
--- a/sys/arm/allwinner/a20/a20_mp.c
+++ b/sys/arm/allwinner/a20/a20_mp.c
@@ -61,7 +61,7 @@ void
 platform_mp_init_secondary(void)
 {
 
-       arm_init_secondary_ic();
+       arm_pic_init_secondary();
 }
 
 void

diff --git a/sys/arm/altera/socfpga/socfpga_mp.c b/sys/arm/altera/socfpga/socfpga_mp.c
index 24784e988814daebc2a10b97962e2188b997862c..461d3f4958bd64ac25a47bf846546bb96981b10b 100644 (file)
--- a/sys/arm/altera/socfpga/socfpga_mp.c
+++ b/sys/arm/altera/socfpga/socfpga_mp.c
@@ -87,7 +87,7 @@ void
 platform_mp_init_secondary(void)
 {
 
-       arm_init_secondary_ic();
+       arm_pic_init_secondary();
 }
 
 void

diff --git a/sys/arm/amlogic/aml8726/aml8726_mp.c b/sys/arm/amlogic/aml8726/aml8726_mp.c
index 4f0bce067667392232ff16610e2a54c19e02181c..1d7ef032d5d8fbb42bb6b9fe305d9ed5e88a6d1c 100644 (file)
--- a/sys/arm/amlogic/aml8726/aml8726_mp.c
+++ b/sys/arm/amlogic/aml8726/aml8726_mp.c
@@ -351,7 +351,7 @@ platform_mp_init_secondary(void)
         * each AP.
         */
 
-        arm_init_secondary_ic();
+        arm_pic_init_secondary();
 }
 
 

diff --git a/sys/arm/annapurna/alpine/alpine_machdep_mp.c b/sys/arm/annapurna/alpine/alpine_machdep_mp.c
index 2c909175cb0505cf5943a4e43d3301f134fbaffa..a4c45b8d07fb49fc53a307faa66f31415d4eaf04 100644 (file)
--- a/sys/arm/annapurna/alpine/alpine_machdep_mp.c
+++ b/sys/arm/annapurna/alpine/alpine_machdep_mp.c
@@ -122,7 +122,7 @@ void
 platform_mp_init_secondary(void)
 {
 
-       arm_init_secondary_ic();
+       arm_pic_init_secondary();
 }
 
 void

diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c
index 6fcb7e0822152ca5c2ac14693c7fc26476bfc1f0..a9f171e8b8379417e3901af8599d2c36d7da53a3 100644 (file)
--- a/sys/arm/arm/gic.c
+++ b/sys/arm/arm/gic.c
@@ -492,7 +492,7 @@ arm_get_next_irq(int last_irq)
 }
 
 void
-arm_init_secondary_ic(void)
+arm_pic_init_secondary(void)
 {
 
        arm_gic_init_secondary(arm_gic_sc->gic_dev);

diff --git a/sys/arm/freescale/imx/imx6_mp.c b/sys/arm/freescale/imx/imx6_mp.c
index b02588cfa22f419582c54d334561f910049ce062..8957c547ad5ea2c30e4c29a08ada1f150515cde7 100644 (file)
--- a/sys/arm/freescale/imx/imx6_mp.c
+++ b/sys/arm/freescale/imx/imx6_mp.c
@@ -69,7 +69,7 @@ void
 platform_mp_init_secondary(void)
 {
 
-       arm_init_secondary_ic();
+       arm_pic_init_secondary();
 }
 
 void

diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h
index 7ab69d9405a0f0b977c8b3c3e2a117eaa4479eaa..6a46f00766a08628f18cfeb438182cb51bf7e705 100644 (file)
--- a/sys/arm/include/intr.h
+++ b/sys/arm/include/intr.h
@@ -85,7 +85,7 @@ extern int (*arm_config_irq)(int irq, enum intr_trigger trig,
 
 void arm_irq_memory_barrier(uintptr_t);
 
-void arm_init_secondary_ic(void);
+void arm_pic_init_secondary(void);
 int  gic_decode_fdt(uint32_t iparentnode, uint32_t *intrcells, int *interrupt,
     int *trig, int *pol);
 

diff --git a/sys/arm/qemu/virt_mp.c b/sys/arm/qemu/virt_mp.c
index 4942745e109f4499822b5a73cb21efc8b00bcedc..2fe1592af0fd25e0b4f0eecd57e0656cb87ce9c0 100644 (file)
--- a/sys/arm/qemu/virt_mp.c
+++ b/sys/arm/qemu/virt_mp.c
@@ -108,7 +108,7 @@ void
 platform_mp_init_secondary(void)
 {
 
-       arm_init_secondary_ic();
+       arm_pic_init_secondary();
 }
 
 void

diff --git a/sys/arm/rockchip/rk30xx_mp.c b/sys/arm/rockchip/rk30xx_mp.c
index 74c8b554c85c34729159a95eebccb8cf11a8a81f..f07605cfe18a9552b1270f14fa4d296805ea3e4e 100644 (file)
--- a/sys/arm/rockchip/rk30xx_mp.c
+++ b/sys/arm/rockchip/rk30xx_mp.c
@@ -82,7 +82,7 @@ void
 platform_mp_init_secondary(void)
 {
 
-       arm_init_secondary_ic();
+       arm_pic_init_secondary();
 }
 
 void

diff --git a/sys/arm/samsung/exynos/exynos5_mp.c b/sys/arm/samsung/exynos/exynos5_mp.c
index 1b3afbbf0d6d10629da38ffe1fc27b4d687814f0..0f4a792b79d9a6d27b1afa6ad5376d4fe4bd9ed5 100644 (file)
--- a/sys/arm/samsung/exynos/exynos5_mp.c
+++ b/sys/arm/samsung/exynos/exynos5_mp.c
@@ -73,7 +73,7 @@ void
 platform_mp_init_secondary(void)
 {
 
-       arm_init_secondary_ic();
+       arm_pic_init_secondary();
 }
 
 void

diff --git a/sys/arm/ti/omap4/omap4_mp.c b/sys/arm/ti/omap4/omap4_mp.c
index 6423e568f24a00a7bea409b004cebebc2fe17eae..f53748e90a9aa621a12cb468b62f9cf04b74b98f 100644 (file)
--- a/sys/arm/ti/omap4/omap4_mp.c
+++ b/sys/arm/ti/omap4/omap4_mp.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 void
 platform_mp_init_secondary(void)
 {
-       arm_init_secondary_ic();
+       arm_pic_init_secondary();
 }
 
 void

diff --git a/sys/arm/xilinx/zy7_mp.c b/sys/arm/xilinx/zy7_mp.c
index 305290ed20342e8db1e91aafd6a82d1a75dd57ce..24e8595a5af39192efb643920544e8088e572ace 100644 (file)
--- a/sys/arm/xilinx/zy7_mp.c
+++ b/sys/arm/xilinx/zy7_mp.c
@@ -49,7 +49,7 @@ void
 platform_mp_init_secondary(void)
 {
 
-       arm_init_secondary_ic();
+       arm_pic_init_secondary();
 }
 
 void