summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandrew <andrew@FreeBSD.org>2015-01-11 16:46:43 +0000
committerandrew <andrew@FreeBSD.org>2015-01-11 16:46:43 +0000
commit1b85e7384419f2b4386d8d3f046dcebc37b05f4f (patch)
tree3fd8d2c42a028cdc06f115db714ce7e875a96016
parentdbc5bca893b30e25a63ab3710d175c3af8da10ef (diff)
downloadFreeBSD-src-1b85e7384419f2b4386d8d3f046dcebc37b05f4f.zip
FreeBSD-src-1b85e7384419f2b4386d8d3f046dcebc37b05f4f.tar.gz
Rename gic_init_secondary to arm_init_secondary_ic to help with the merge
of the arm_intrng project branch.
-rw-r--r--sys/arm/allwinner/a20/a20_mp.c2
-rw-r--r--sys/arm/altera/socfpga/socfpga_mp.c2
-rw-r--r--sys/arm/arm/gic.c2
-rw-r--r--sys/arm/freescale/imx/imx6_mp.c2
-rw-r--r--sys/arm/include/intr.h2
-rw-r--r--sys/arm/rockchip/rk30xx_mp.c2
-rw-r--r--sys/arm/samsung/exynos/exynos5_mp.c2
-rw-r--r--sys/arm/ti/omap4/omap4_mp.c2
-rw-r--r--sys/arm/xilinx/zy7_mp.c2
9 files changed, 9 insertions, 9 deletions
diff --git a/sys/arm/allwinner/a20/a20_mp.c b/sys/arm/allwinner/a20/a20_mp.c
index 463aec8..aa450a7 100644
--- a/sys/arm/allwinner/a20/a20_mp.c
+++ b/sys/arm/allwinner/a20/a20_mp.c
@@ -57,7 +57,7 @@ void
platform_mp_init_secondary(void)
{
- gic_init_secondary();
+ arm_init_secondary_ic();
}
void
diff --git a/sys/arm/altera/socfpga/socfpga_mp.c b/sys/arm/altera/socfpga/socfpga_mp.c
index 37a009c..0942ea7 100644
--- a/sys/arm/altera/socfpga/socfpga_mp.c
+++ b/sys/arm/altera/socfpga/socfpga_mp.c
@@ -84,7 +84,7 @@ void
platform_mp_init_secondary(void)
{
- gic_init_secondary();
+ arm_init_secondary_ic();
}
void
diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c
index 4a2de81..333fac9 100644
--- a/sys/arm/arm/gic.c
+++ b/sys/arm/arm/gic.c
@@ -488,7 +488,7 @@ arm_get_next_irq(int last_irq)
}
void
-gic_init_secondary(void)
+arm_init_secondary_ic(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 e6366dd..afadee0 100644
--- a/sys/arm/freescale/imx/imx6_mp.c
+++ b/sys/arm/freescale/imx/imx6_mp.c
@@ -66,7 +66,7 @@ void
platform_mp_init_secondary(void)
{
- gic_init_secondary();
+ arm_init_secondary_ic();
}
void
diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h
index 9ee86f3..c58ee3e 100644
--- 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 gic_init_secondary(void);
+void arm_init_secondary_ic(void);
int gic_decode_fdt(uint32_t iparentnode, uint32_t *intrcells, int *interrupt,
int *trig, int *pol);
diff --git a/sys/arm/rockchip/rk30xx_mp.c b/sys/arm/rockchip/rk30xx_mp.c
index 54457a3..1232611 100644
--- a/sys/arm/rockchip/rk30xx_mp.c
+++ b/sys/arm/rockchip/rk30xx_mp.c
@@ -79,7 +79,7 @@ void
platform_mp_init_secondary(void)
{
- gic_init_secondary();
+ arm_init_secondary_ic();
}
void
diff --git a/sys/arm/samsung/exynos/exynos5_mp.c b/sys/arm/samsung/exynos/exynos5_mp.c
index aaeaf80..fa0fa07 100644
--- a/sys/arm/samsung/exynos/exynos5_mp.c
+++ b/sys/arm/samsung/exynos/exynos5_mp.c
@@ -70,7 +70,7 @@ void
platform_mp_init_secondary(void)
{
- gic_init_secondary();
+ arm_init_secondary_ic();
}
void
diff --git a/sys/arm/ti/omap4/omap4_mp.c b/sys/arm/ti/omap4/omap4_mp.c
index 178db20..e298cd1 100644
--- a/sys/arm/ti/omap4/omap4_mp.c
+++ b/sys/arm/ti/omap4/omap4_mp.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
void
platform_mp_init_secondary(void)
{
- gic_init_secondary();
+ arm_init_secondary_ic();
}
void
diff --git a/sys/arm/xilinx/zy7_mp.c b/sys/arm/xilinx/zy7_mp.c
index 831c4df..ecb1844 100644
--- a/sys/arm/xilinx/zy7_mp.c
+++ b/sys/arm/xilinx/zy7_mp.c
@@ -43,7 +43,7 @@ void
platform_mp_init_secondary(void)
{
- gic_init_secondary();
+ arm_init_secondary_ic();
}
void
OpenPOWER on IntegriCloud