summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/score/cpu/arm/rtems/score/cpu.h2
-rw-r--r--cpukit/score/cpu/i386/rtems/score/cpu.h2
-rw-r--r--cpukit/score/cpu/no_cpu/rtems/score/cpu.h4
-rw-r--r--cpukit/score/cpu/powerpc/rtems/score/cpu.h2
-rw-r--r--cpukit/score/cpu/sparc/rtems/score/cpu.h2
-rw-r--r--cpukit/score/src/percpu.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/cpukit/score/cpu/arm/rtems/score/cpu.h
index 08adb6bf4f..602783e443 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpu.h
+++ b/cpukit/score/cpu/arm/rtems/score/cpu.h
@@ -485,7 +485,7 @@ void _CPU_Context_validate( uintptr_t pattern );
_ARM_Send_event();
}
- static inline void _CPU_Processor_event_receive( void )
+ static inline void _CPU_SMP_Processor_event_receive( void )
{
_ARM_Wait_for_event();
_ARM_Data_memory_barrier();
diff --git a/cpukit/score/cpu/i386/rtems/score/cpu.h b/cpukit/score/cpu/i386/rtems/score/cpu.h
index 4ecd186c40..5bd14c347a 100644
--- a/cpukit/score/cpu/i386/rtems/score/cpu.h
+++ b/cpukit/score/cpu/i386/rtems/score/cpu.h
@@ -464,7 +464,7 @@ uint32_t _CPU_ISR_Get_level( void );
__asm__ volatile ( "" : : : "memory" );
}
- static inline void _CPU_Processor_event_receive( void )
+ static inline void _CPU_SMP_Processor_event_receive( void )
{
__asm__ volatile ( "" : : : "memory" );
}
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h b/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
index 2c697a8323..0ffce818f8 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
+++ b/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
@@ -1435,7 +1435,7 @@ static inline uint32_t CPU_swap_u32(
* transactions. This function must ensure that preceding store operations
* can be observed by other processors.
*
- * @see _CPU_Processor_event_receive().
+ * @see _CPU_SMP_Processor_event_receive().
*/
static inline void _CPU_SMP_Processor_event_broadcast( void )
{
@@ -1450,7 +1450,7 @@ static inline uint32_t CPU_swap_u32(
*
* @see _CPU_SMP_Processor_event_broadcast().
*/
- static inline void _CPU_Processor_event_receive( void )
+ static inline void _CPU_SMP_Processor_event_receive( void )
{
__asm__ volatile ( "" : : : "memory" );
}
diff --git a/cpukit/score/cpu/powerpc/rtems/score/cpu.h b/cpukit/score/cpu/powerpc/rtems/score/cpu.h
index 119dff2a73..1ad56dc91a 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/cpu.h
+++ b/cpukit/score/cpu/powerpc/rtems/score/cpu.h
@@ -1021,7 +1021,7 @@ void _CPU_Context_validate( uintptr_t pattern );
__asm__ volatile ( "" : : : "memory" );
}
- static inline void _CPU_Processor_event_receive( void )
+ static inline void _CPU_SMP_Processor_event_receive( void )
{
__asm__ volatile ( "" : : : "memory" );
}
diff --git a/cpukit/score/cpu/sparc/rtems/score/cpu.h b/cpukit/score/cpu/sparc/rtems/score/cpu.h
index 21910ed325..c0a8d0a9e8 100644
--- a/cpukit/score/cpu/sparc/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sparc/rtems/score/cpu.h
@@ -1195,7 +1195,7 @@ void _CPU_Context_restore(
__asm__ volatile ( "" : : : "memory" );
}
- static inline void _CPU_Processor_event_receive( void )
+ static inline void _CPU_SMP_Processor_event_receive( void )
{
__asm__ volatile ( "" : : : "memory" );
}
diff --git a/cpukit/score/src/percpu.c b/cpukit/score/src/percpu.c
index 3e51bda62f..85157db9cc 100644
--- a/cpukit/score/src/percpu.c
+++ b/cpukit/score/src/percpu.c
@@ -88,7 +88,7 @@
)
{
while ( per_cpu->state != desired_state ) {
- _CPU_Processor_event_receive();
+ _CPU_SMP_Processor_event_receive();
}
}
#else