1 files changed, 7 insertions, 14 deletions
diff --git a/cpukit/include/rtems/score/smpimpl.h b/cpukit/include/rtems/score/smpimpl.h
index 8e965968a1..a8e3a3be15 100644
--- a/cpukit/include/rtems/score/smpimpl.h
+++ b/cpukit/include/rtems/score/smpimpl.h
@@ -40,7 +40,7 @@
 
 #include <rtems/score/smp.h>
 #include <rtems/score/percpu.h>
-#include <rtems/score/processormask.h>
+#include <rtems/score/processormaskimpl.h>
 #include <rtems/fatal.h>
 
 #ifdef __cplusplus
@@ -166,12 +166,9 @@ RTEMS_NO_RETURN void _SMP_Start_multitasking_on_secondary_processor(
  * @param[in, out] cpu_self is the processor control of the processor executing
  *   this function.
  *
- * @return Returns the processed message.
+ * @param message is the message to process.
  */
-long unsigned _SMP_Process_message(
-  Per_CPU_Control *cpu_self,
-  long unsigned    message
-);
+void _SMP_Process_message( Per_CPU_Control *cpu_self, long unsigned message );
 
 /**
  * @brief Tries to process the current SMP message.
@@ -200,10 +197,8 @@ void _SMP_Try_to_process_message(
  *
  * @param[in, out] cpu_self is the processor control of the processor executing
  *   this function.
- *
- * @return Returns the processed message.
  */
-static inline long unsigned _SMP_Inter_processor_interrupt_handler(
+static inline void _SMP_Inter_processor_interrupt_handler(
   Per_CPU_Control *cpu_self
 )
 {
@@ -222,10 +217,8 @@ static inline long unsigned _SMP_Inter_processor_interrupt_handler(
   );
 
   if ( RTEMS_PREDICT_FALSE( message != 0 ) ) {
-    return _SMP_Process_message( cpu_self, message );
+    _SMP_Process_message( cpu_self, message );
   }
-
-  return message;
 }
 
 /**
@@ -355,7 +348,7 @@ void _SMP_Synchronize( void );
  *
  * @return The processor mask with all online processors.
  */
-RTEMS_INLINE_ROUTINE const Processor_mask *_SMP_Get_online_processors( void )
+static inline const Processor_mask *_SMP_Get_online_processors( void )
 {
 #if defined(RTEMS_SMP)
   return &_SMP_Online_processors;
@@ -370,7 +363,7 @@ RTEMS_INLINE_ROUTINE const Processor_mask *_SMP_Get_online_processors( void )
  * @return True if inter-processor interrupts are needed for the correct system
  * operation, otherwise false.
  */
-RTEMS_INLINE_ROUTINE bool _SMP_Need_inter_processor_interrupts( void )
+static inline bool _SMP_Need_inter_processor_interrupts( void )
 {
   /*
    * Use the configured processor maximum instead of the actual to allow