[rtems commit] score: Rename _SMP_Processor_count

Sebastian Huber sebh at rtems.org
Thu Apr 11 07:19:25 UTC 2019


Module:    rtems
Branch:    master
Commit:    cfcd6dc98cad1dd677ac60ad80e7ef3aa39b926b
Changeset: http://git.rtems.org/rtems/commit/?id=cfcd6dc98cad1dd677ac60ad80e7ef3aa39b926b

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Apr 11 08:52:36 2019 +0200

score: Rename _SMP_Processor_count

Rename _SMP_Processor_count in _SMP_Processor_maximum to be in line with
the API level rtems_scheduler_get_processor_maximum().

Update #3732.

---

 bsps/powerpc/qoriq/start/bsprestart.c | 2 +-
 cpukit/include/rtems/score/smp.h      | 4 ++--
 cpukit/score/src/smp.c                | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bsps/powerpc/qoriq/start/bsprestart.c b/bsps/powerpc/qoriq/start/bsprestart.c
index 228d74c..3118afd 100644
--- a/bsps/powerpc/qoriq/start/bsprestart.c
+++ b/bsps/powerpc/qoriq/start/bsprestart.c
@@ -67,7 +67,7 @@ static void restart_interrupt(void *arg)
   (void) level;
 
   _SMP_barrier_State_initialize(&bs);
-  _SMP_barrier_Wait(&restart_barrier, &bs, _SMP_Processor_count);
+  _SMP_barrier_Wait(&restart_barrier, &bs, _SMP_Get_processor_count());
 
   cpu_self_index = rtems_scheduler_get_processor();
   thread_index = cpu_self_index % QORIQ_THREAD_COUNT;
diff --git a/cpukit/include/rtems/score/smp.h b/cpukit/include/rtems/score/smp.h
index cc682a4..a960097 100644
--- a/cpukit/include/rtems/score/smp.h
+++ b/cpukit/include/rtems/score/smp.h
@@ -35,11 +35,11 @@ extern "C" {
  */
 
 #if defined( RTEMS_SMP )
-  extern uint32_t _SMP_Processor_count;
+  extern uint32_t _SMP_Processor_maximum;
 
   static inline uint32_t _SMP_Get_processor_count( void )
   {
-    return _SMP_Processor_count;
+    return _SMP_Processor_maximum;
   }
 #else
   #define _SMP_Get_processor_count() UINT32_C(1)
diff --git a/cpukit/score/src/smp.c b/cpukit/score/src/smp.c
index 7864640..3d35154 100644
--- a/cpukit/score/src/smp.c
+++ b/cpukit/score/src/smp.c
@@ -30,7 +30,7 @@
 
 Processor_mask _SMP_Online_processors;
 
-uint32_t _SMP_Processor_count;
+uint32_t _SMP_Processor_maximum;
 
 static const Scheduler_Assignment *_Scheduler_Get_initial_assignment(
   uint32_t cpu_index
@@ -126,7 +126,7 @@ void _SMP_Handler_initialize( void )
 
   cpu_count = _CPU_SMP_Initialize();
   cpu_count = cpu_count < cpu_max ? cpu_count : cpu_max;
-  _SMP_Processor_count = cpu_count;
+  _SMP_Processor_maximum = cpu_count;
 
   for ( cpu_index = cpu_count ; cpu_index < cpu_max; ++cpu_index ) {
     const Scheduler_Assignment *assignment;




More information about the vc mailing list