3 files changed, 47 insertions, 47 deletions

diff --git a/cpukit/score/include/rtems/score/percpu.h b/cpukit/score/include/rtems/score/percpu.h
index e491ffa002..afc38031df 100644
--- a/cpukit/score/include/rtems/score/percpu.h
+++ b/cpukit/score/include/rtems/score/percpu.h
@@ -347,55 +347,55 @@ typedef struct {
 extern Per_CPU_Control_envelope _Per_CPU_Information[] CPU_STRUCTURE_ALIGNMENT;
 
 #if defined( RTEMS_SMP )
-#define _Per_CPU_Acquire( per_cpu ) \
+#define _Per_CPU_Acquire( cpu ) \
   _SMP_ticket_lock_Acquire( \
-    &( per_cpu )->Lock, \
-    &( per_cpu )->Lock_stats_context \
+    &( cpu )->Lock, \
+    &( cpu )->Lock_stats_context \
   )
 #else
-#define _Per_CPU_Acquire( per_cpu ) \
+#define _Per_CPU_Acquire( cpu ) \
   do { \
-    (void) ( per_cpu ); \
+    (void) ( cpu ); \
   } while ( 0 )
 #endif
 
 #if defined( RTEMS_SMP )
-#define _Per_CPU_Release( per_cpu ) \
+#define _Per_CPU_Release( cpu ) \
   _SMP_ticket_lock_Release( \
-    &( per_cpu )->Lock, \
-    &( per_cpu )->Lock_stats_context \
+    &( cpu )->Lock, \
+    &( cpu )->Lock_stats_context \
   )
 #else
-#define _Per_CPU_Release( per_cpu ) \
+#define _Per_CPU_Release( cpu ) \
   do { \
-    (void) ( per_cpu ); \
+    (void) ( cpu ); \
   } while ( 0 )
 #endif
 
 #if defined( RTEMS_SMP )
-#define _Per_CPU_ISR_disable_and_acquire( per_cpu, isr_cookie ) \
+#define _Per_CPU_ISR_disable_and_acquire( cpu, isr_cookie ) \
   do { \
     _ISR_Disable_without_giant( isr_cookie ); \
-    _Per_CPU_Acquire( per_cpu ); \
+    _Per_CPU_Acquire( cpu ); \
   } while ( 0 )
 #else
-#define _Per_CPU_ISR_disable_and_acquire( per_cpu, isr_cookie ) \
+#define _Per_CPU_ISR_disable_and_acquire( cpu, isr_cookie ) \
   do { \
     _ISR_Disable( isr_cookie ); \
-    (void) ( per_cpu ); \
+    (void) ( cpu ); \
   } while ( 0 )
 #endif
 
 #if defined( RTEMS_SMP )
-#define _Per_CPU_Release_and_ISR_enable( per_cpu, isr_cookie ) \
+#define _Per_CPU_Release_and_ISR_enable( cpu, isr_cookie ) \
   do { \
-    _Per_CPU_Release( per_cpu ); \
+    _Per_CPU_Release( cpu ); \
     _ISR_Enable_without_giant( isr_cookie ); \
   } while ( 0 )
 #else
-#define _Per_CPU_Release_and_ISR_enable( per_cpu, isr_cookie ) \
+#define _Per_CPU_Release_and_ISR_enable( cpu, isr_cookie ) \
   do { \
-    (void) ( per_cpu ); \
+    (void) ( cpu ); \
     _ISR_Enable( isr_cookie ); \
   } while ( 0 )
 #endif
@@ -443,13 +443,13 @@ extern Per_CPU_Control_envelope _Per_CPU_Information[] CPU_STRUCTURE_ALIGNMENT;
 #if defined( RTEMS_SMP )
 static inline Per_CPU_Control *_Per_CPU_Get( void )
 {
-  Per_CPU_Control *per_cpu = _Per_CPU_Get_snapshot();
+  Per_CPU_Control *cpu_self = _Per_CPU_Get_snapshot();
 
   _Assert(
-    per_cpu->thread_dispatch_disable_level != 0 || _ISR_Get_level() != 0
+    cpu_self->thread_dispatch_disable_level != 0 || _ISR_Get_level() != 0
   );
 
-  return per_cpu;
+  return cpu_self;
 }
 #else
 #define _Per_CPU_Get() _Per_CPU_Get_snapshot()
@@ -460,22 +460,22 @@ static inline Per_CPU_Control *_Per_CPU_Get_by_index( uint32_t index )
   return &_Per_CPU_Information[ index ].per_cpu;
 }
 
-static inline uint32_t _Per_CPU_Get_index( const Per_CPU_Control *per_cpu )
+static inline uint32_t _Per_CPU_Get_index( const Per_CPU_Control *cpu )
 {
   const Per_CPU_Control_envelope *per_cpu_envelope =
-    ( const Per_CPU_Control_envelope * ) per_cpu;
+    ( const Per_CPU_Control_envelope * ) cpu;
 
   return ( uint32_t ) ( per_cpu_envelope - &_Per_CPU_Information[ 0 ] );
 }
 
 static inline bool _Per_CPU_Is_processor_started(
-  const Per_CPU_Control *per_cpu
+  const Per_CPU_Control *cpu
 )
 {
 #if defined( RTEMS_SMP )
-  return per_cpu->started;
+  return cpu->started;
 #else
-  (void) per_cpu;
+  (void) cpu;
 
   return true;
 #endif
@@ -483,9 +483,9 @@ static inline bool _Per_CPU_Is_processor_started(
 
 #if defined( RTEMS_SMP )
 
-static inline void _Per_CPU_Send_interrupt( const Per_CPU_Control *per_cpu )
+static inline void _Per_CPU_Send_interrupt( const Per_CPU_Control *cpu )
 {
-  _CPU_SMP_Send_interrupt( _Per_CPU_Get_index( per_cpu ) );
+  _CPU_SMP_Send_interrupt( _Per_CPU_Get_index( cpu ) );
 }
 
 /**
@@ -496,7 +496,7 @@ static inline void _Per_CPU_Send_interrupt( const Per_CPU_Control *per_cpu )
 void _Per_CPU_Initialize(void);
 
 void _Per_CPU_State_change(
-  Per_CPU_Control *per_cpu,
+  Per_CPU_Control *cpu,
   Per_CPU_State new_state
 );
 
diff --git a/cpukit/score/include/rtems/score/profiling.h b/cpukit/score/include/rtems/score/profiling.h
index 62ac3c325e..f5fa6cc241 100644
--- a/cpukit/score/include/rtems/score/profiling.h
+++ b/cpukit/score/include/rtems/score/profiling.h
@@ -38,31 +38,31 @@ extern "C" {
  */
 
 static inline void _Profiling_Thread_dispatch_disable(
-  Per_CPU_Control *per_cpu,
+  Per_CPU_Control *cpu,
   uint32_t previous_thread_dispatch_disable_level
 )
 {
 #if defined( RTEMS_PROFILING )
   if ( previous_thread_dispatch_disable_level == 0 ) {
-    Per_CPU_Stats *stats = &per_cpu->Stats;
+    Per_CPU_Stats *stats = &cpu->Stats;
 
     stats->thread_dispatch_disabled_instant = _CPU_Counter_read();
     ++stats->thread_dispatch_disabled_count;
   }
 #else
-  (void) per_cpu;
+  (void) cpu;
   (void) previous_thread_dispatch_disable_level;
 #endif
 }
 
 static inline void _Profiling_Thread_dispatch_enable(
-  Per_CPU_Control *per_cpu,
+  Per_CPU_Control *cpu,
   uint32_t new_thread_dispatch_disable_level
 )
 {
 #if defined( RTEMS_PROFILING )
   if ( new_thread_dispatch_disable_level == 0 ) {
-    Per_CPU_Stats *stats = &per_cpu->Stats;
+    Per_CPU_Stats *stats = &cpu->Stats;
     CPU_Counter_ticks now = _CPU_Counter_read();
     CPU_Counter_ticks delta = _CPU_Counter_difference(
       now,
@@ -76,30 +76,30 @@ static inline void _Profiling_Thread_dispatch_enable(
     }
   }
 #else
-  (void) per_cpu;
+  (void) cpu;
   (void) new_thread_dispatch_disable_level;
 #endif
 }
 
 static inline void _Profiling_Update_max_interrupt_delay(
-  Per_CPU_Control *per_cpu,
+  Per_CPU_Control *cpu,
   CPU_Counter_ticks interrupt_delay
 )
 {
 #if defined( RTEMS_PROFILING )
-  Per_CPU_Stats *stats = &per_cpu->Stats;
+  Per_CPU_Stats *stats = &cpu->Stats;
 
   if ( stats->max_interrupt_delay < interrupt_delay ) {
     stats->max_interrupt_delay = interrupt_delay;
   }
 #else
-  (void) per_cpu;
+  (void) cpu;
   (void) interrupt_delay;
 #endif
 }
 
 void _Profiling_Outer_most_interrupt_entry_and_exit(
-  Per_CPU_Control *per_cpu,
+  Per_CPU_Control *cpu,
   CPU_Counter_ticks interrupt_entry_instant,
   CPU_Counter_ticks interrupt_exit_instant
 );
diff --git a/cpukit/score/include/rtems/score/smpimpl.h b/cpukit/score/include/rtems/score/smpimpl.h
index 225da0fde4..c281592bdc 100644
--- a/cpukit/score/include/rtems/score/smpimpl.h
+++ b/cpukit/score/include/rtems/score/smpimpl.h
@@ -107,16 +107,16 @@ void _SMP_Start_multitasking_on_secondary_processor( void )
  */
 static inline void _SMP_Inter_processor_interrupt_handler( void )
 {
-  Per_CPU_Control *self_cpu = _Per_CPU_Get();
+  Per_CPU_Control *cpu_self = _Per_CPU_Get();
 
-  if ( self_cpu->message != 0 ) {
+  if ( cpu_self->message != 0 ) {
     uint32_t  message;
     ISR_Level level;
 
-    _Per_CPU_ISR_disable_and_acquire( self_cpu, level );
-    message = self_cpu->message;
-    self_cpu->message = 0;
-    _Per_CPU_Release_and_ISR_enable( self_cpu, level );
+    _Per_CPU_ISR_disable_and_acquire( cpu_self, level );
+    message = cpu_self->message;
+    cpu_self->message = 0;
+    _Per_CPU_Release_and_ISR_enable( cpu_self, level );
 
     if ( ( message & SMP_MESSAGE_SHUTDOWN ) != 0 ) {
       rtems_fatal( RTEMS_FATAL_SOURCE_SMP, SMP_FATAL_SHUTDOWN );
@@ -130,10 +130,10 @@ static inline void _SMP_Inter_processor_interrupt_handler( void )
  *
  *  The target processor may be the sending processor.
  *
- *  @param[in] cpu The target processor of the message.
+ *  @param[in] cpu_index The target processor of the message.
  *  @param[in] message The message.
  */
-void _SMP_Send_message( uint32_t cpu, uint32_t message );
+void _SMP_Send_message( uint32_t cpu_index, uint32_t message );
 
 /**
  *  @brief Request of others CPUs.