score: Rename rtems_smp_process_interrupt()

Rename rtems_smp_process_interrupt() into
_SMP_Inter_processor_interrupt_handler().  Delete unused header file
<rtems/bspsmp.h>.

5 files changed, 13 insertions, 18 deletions

diff --git a/c/src/lib/libbsp/arm/shared/arm-a9mpcore-smp.c b/c/src/lib/libbsp/arm/shared/arm-a9mpcore-smp.c
index bf776c5aab..9baf1939cb 100644
--- a/c/src/lib/libbsp/arm/shared/arm-a9mpcore-smp.c
+++ b/c/src/lib/libbsp/arm/shared/arm-a9mpcore-smp.c
@@ -14,15 +14,15 @@
 
 #include <assert.h>
 
-#include <rtems/bspsmp.h>
+#include <rtems/score/smpimpl.h>
 
 #include <libcpu/arm-cp15.h>
 
 #include <bsp/irq.h>
 
-static void ipi_handler(void *arg)
+static void bsp_inter_processor_interrupt(void *arg)
 {
-  rtems_smp_process_interrupt();
+  _SMP_Inter_processor_interrupt_handler();
 }
 
 uint32_t _CPU_SMP_Initialize(uint32_t configured_cpu_count)
@@ -36,7 +36,7 @@ uint32_t _CPU_SMP_Initialize(uint32_t configured_cpu_count)
     ARM_GIC_IRQ_SGI_0,
     "IPI",
     RTEMS_INTERRUPT_UNIQUE,
-    ipi_handler,
+    bsp_inter_processor_interrupt,
     NULL
   );
   assert(sc == RTEMS_SUCCESSFUL);
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 e11bc71f26..dd1b7c1499 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
@@ -23,7 +23,6 @@
 #ifndef LIBBSP_ARM_SHARED_ARM_A9MPCORE_START_H
 #define LIBBSP_ARM_SHARED_ARM_A9MPCORE_START_H
 
-#include <rtems/bspsmp.h>
 #include <rtems/score/smpimpl.h>
 
 #include <libcpu/arm-cp15.h>
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 1ed5d41b64..1e5faeb644 100644
--- a/c/src/lib/libbsp/i386/shared/smp/smp-imps.c
+++ b/c/src/lib/libbsp/i386/shared/smp/smp-imps.c
@@ -78,7 +78,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <rtems.h>
-#include <rtems/bspsmp.h>
 #include <rtems/bspIo.h>
 #include <libcpu/cpu.h>
 #include <assert.h>
@@ -743,13 +742,13 @@ static void smp_apic_ack(void)
   IMPS_LAPIC_WRITE(LAPIC_EOI, 0 );     /* ACK the interrupt */
 }
 
-static void ap_ipi_isr(void *arg)
+static void bsp_inter_processor_interrupt(void *arg)
 {
   (void) arg;
 
   smp_apic_ack();
 
-  rtems_smp_process_interrupt();
+  _SMP_Inter_processor_interrupt_handler();
 }
 
 static void ipi_install_irq(void)
@@ -760,7 +759,7 @@ static void ipi_install_irq(void)
     16,
     "smp-imps",
     RTEMS_INTERRUPT_UNIQUE,
-    ap_ipi_isr,
+    bsp_inter_processor_interrupt,
     NULL
   );
   assert(status == RTEMS_SUCCESSFUL);
@@ -787,7 +786,6 @@ static void secondary_cpu_initialize(void)
   _SMP_Start_multitasking_on_secondary_processor();
 }
 
-#include <rtems/bspsmp.h>
 uint32_t _CPU_SMP_Initialize( uint32_t configured_cpu_count )
 {
   int cores;
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/smp.c b/c/src/lib/libbsp/powerpc/qoriq/startup/smp.c
index 4260c2b9e2..89823d5ece 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/smp.c
+++ b/c/src/lib/libbsp/powerpc/qoriq/startup/smp.c
@@ -14,7 +14,6 @@
 
 #include <assert.h>
 
-#include <rtems/bspsmp.h>
 #include <rtems/score/smpimpl.h>
 
 #include <libcpu/powerpc-utility.h>
@@ -137,9 +136,9 @@ void qoriq_secondary_cpu_initialize(void)
   _SMP_Start_multitasking_on_secondary_processor();
 }
 
-static void ipi_handler(void *arg)
+static void bsp_inter_processor_interrupt(void *arg)
 {
-  rtems_smp_process_interrupt();
+  _SMP_Inter_processor_interrupt_handler();
 }
 
 uint32_t _CPU_SMP_Initialize(uint32_t configured_cpu_count)
@@ -152,7 +151,7 @@ uint32_t _CPU_SMP_Initialize(uint32_t configured_cpu_count)
     QORIQ_IRQ_IPI_0,
     "IPI",
     RTEMS_INTERRUPT_UNIQUE,
-    ipi_handler,
+    bsp_inter_processor_interrupt,
     NULL
   );
   assert(sc == RTEMS_SUCCESSFUL);
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 aac0396ee1..59861b344b 100644
--- a/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c
+++ b/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c
@@ -16,7 +16,6 @@
 #include <bsp.h>
 #include <leon.h>
 #include <rtems/bspIo.h>
-#include <rtems/bspsmp.h>
 #include <rtems/score/smpimpl.h>
 #include <stdlib.h>
 
@@ -32,11 +31,11 @@ static inline unsigned int sparc_leon3_get_cctrl( void )
   return v;
 }
 
-static rtems_isr bsp_ap_ipi_isr(
+static rtems_isr bsp_inter_processor_interrupt(
   rtems_vector_number vector
 )
 {
-  rtems_smp_process_interrupt();
+  _SMP_Inter_processor_interrupt_handler();
 }
 
 void leon3_secondary_cpu_initialize(uint32_t cpu)
@@ -75,7 +74,7 @@ uint32_t _CPU_SMP_Initialize( uint32_t configured_cpu_count )
 
   if ( used_cpu_count > 1 ) {
     LEON_Unmask_interrupt(LEON3_MP_IRQ);
-    set_vector(bsp_ap_ipi_isr, LEON_TRAP_TYPE(LEON3_MP_IRQ), 1);
+    set_vector(bsp_inter_processor_interrupt, LEON_TRAP_TYPE(LEON3_MP_IRQ), 1);
   }
 
   for ( cpu = 1 ; cpu < used_cpu_count ; ++cpu ) {