From 911b1d228bd3424a4d695f8c41d71e2341873077 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 17 Feb 2014 15:02:54 +0100
Subject: score: Rename rtems_smp_secondary_cpu_initialize()

Rename rtems_smp_secondary_cpu_initialize() into
_SMP_Start_multitasking_on_secondary_processor().  Move declaration to
<rtems/score/smpimpl.h>.
---
 c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-start.h | 3 ++-
 c/src/lib/libbsp/i386/shared/smp/smp-imps.c              | 3 ++-
 c/src/lib/libbsp/powerpc/qoriq/startup/smp.c             | 3 ++-
 c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c             | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'c/src/lib/libbsp')

diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-start.h b/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-start.h
index 9ebc5a5cac..e11bc71f26 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-start.h
+++ b/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-start.h
@@ -24,6 +24,7 @@
 #define LIBBSP_ARM_SHARED_ARM_A9MPCORE_START_H
 
 #include <rtems/bspsmp.h>
+#include <rtems/score/smpimpl.h>
 
 #include <libcpu/arm-cp15.h>
 
@@ -109,7 +110,7 @@ BSP_START_TEXT_SECTION static inline arm_a9mpcore_start_hook_0(void)
       ctrl |= ARM_CP15_CTRL_I | ARM_CP15_CTRL_C | ARM_CP15_CTRL_M;
       arm_cp15_set_control(ctrl);
 
-      rtems_smp_secondary_cpu_initialize();
+      _SMP_Start_multitasking_on_secondary_processor();
     } else {
       /* FIXME: Shutdown processor */
       while (1) {
diff --git a/c/src/lib/libbsp/i386/shared/smp/smp-imps.c b/c/src/lib/libbsp/i386/shared/smp/smp-imps.c
index 6170beb1cb..1ed5d41b64 100644
--- a/c/src/lib/libbsp/i386/shared/smp/smp-imps.c
+++ b/c/src/lib/libbsp/i386/shared/smp/smp-imps.c
@@ -56,6 +56,7 @@
 #include <bsp/apic.h>
 #include <bsp/smp-imps.h>
 #include <bsp/irq.h>
+#include <rtems/score/smpimpl.h>
 
 /*
  *  XXXXX  The following absolutely must be defined!!!
@@ -783,7 +784,7 @@ static void secondary_cpu_initialize(void)
   enable_sse();
 #endif
 
-  rtems_smp_secondary_cpu_initialize();
+  _SMP_Start_multitasking_on_secondary_processor();
 }
 
 #include <rtems/bspsmp.h>
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/smp.c b/c/src/lib/libbsp/powerpc/qoriq/startup/smp.c
index d124303f15..4260c2b9e2 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/smp.c
+++ b/c/src/lib/libbsp/powerpc/qoriq/startup/smp.c
@@ -15,6 +15,7 @@
 #include <assert.h>
 
 #include <rtems/bspsmp.h>
+#include <rtems/score/smpimpl.h>
 
 #include <libcpu/powerpc-utility.h>
 
@@ -133,7 +134,7 @@ void qoriq_secondary_cpu_initialize(void)
 
   bsp_interrupt_vector_enable(QORIQ_IRQ_IPI_0);
 
-  rtems_smp_secondary_cpu_initialize();
+  _SMP_Start_multitasking_on_secondary_processor();
 }
 
 static void ipi_handler(void *arg)
diff --git a/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c b/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c
index dccca812d9..aac0396ee1 100644
--- a/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c
+++ b/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c
@@ -17,6 +17,7 @@
 #include <leon.h>
 #include <rtems/bspIo.h>
 #include <rtems/bspsmp.h>
+#include <rtems/score/smpimpl.h>
 #include <stdlib.h>
 
 static inline void sparc_leon3_set_cctrl( unsigned int val )
@@ -44,7 +45,7 @@ void leon3_secondary_cpu_initialize(uint32_t cpu)
   LEON_Unmask_interrupt(LEON3_MP_IRQ);
   LEON3_IrqCtrl_Regs->mask[cpu] |= 1 << LEON3_MP_IRQ;
 
-  rtems_smp_secondary_cpu_initialize();
+  _SMP_Start_multitasking_on_secondary_processor();
 }
 
 uint32_t _CPU_SMP_Initialize( uint32_t configured_cpu_count )
-- 
cgit v1.2.3