Almost all copies of platform_mp_init_secondary just called

intr_pic_init_secondary. Replace them with a direct call. On BCM2836
and ARMADA XP we need to add this function, but it can be empty.

Reviewed by:	ian, imp
Sponsored by:	ABT Systems Ltd
Differential Revision:	https://reviews.freebsd.org/D5460

3 files changed, 5 insertions, 12 deletions

diff --git a/sys/arm/mv/armada38x/armada38x_mp.c b/sys/arm/mv/armada38x/armada38x_mp.c
index b7cf3ef..8dc404f 100644
--- a/sys/arm/mv/armada38x/armada38x_mp.c
+++ b/sys/arm/mv/armada38x/armada38x_mp.c
@@ -131,13 +131,6 @@ platform_mp_setmaxid(void)
 }
 
 void
-platform_mp_init_secondary(void)
-{
-
-	intr_pic_init_secondary();
-}
-
-void
 platform_mp_start_ap(void)
 {
 	int rv;
diff --git a/sys/arm/mv/armadaxp/armadaxp_mp.c b/sys/arm/mv/armadaxp/armadaxp_mp.c
index fd00522..2a9265d 100644
--- a/sys/arm/mv/armadaxp/armadaxp_mp.c
+++ b/sys/arm/mv/armadaxp/armadaxp_mp.c
@@ -87,11 +87,6 @@ platform_mp_setmaxid(void)
 	mp_maxid = mp_ncpus - 1;
 }
 
-void
-platform_mp_init_secondary(void)
-{
-}
-
 void mptramp(void);
 void mptramp_end(void);
 extern vm_offset_t mptramp_pmu_boot;
diff --git a/sys/arm/mv/mpic.c b/sys/arm/mv/mpic.c
index 7eb5d2a..ebd1477 100644
--- a/sys/arm/mv/mpic.c
+++ b/sys/arm/mv/mpic.c
@@ -361,6 +361,11 @@ mv_msi_data(int irq, uint64_t *addr, uint32_t *data)
 
 #if defined(SMP)
 void
+intr_pic_init_secondary(void)
+{
+}
+
+void
 pic_ipi_send(cpuset_t cpus, u_int ipi)
 {
 	uint32_t val, i;