score: Simplify _SMP_Multicast_action()

Move resposibility to disable thread dispatching to the caller of
_SMP_Multicast_action().  Using an interrupt disable for this purpose is
questionable.

2 files changed, 10 insertions, 23 deletions

diff --git a/cpukit/include/rtems/score/smpimpl.h b/cpukit/include/rtems/score/smpimpl.h
index 452f39a3b5..ecea1fda43 100644
--- a/cpukit/include/rtems/score/smpimpl.h
+++ b/cpukit/include/rtems/score/smpimpl.h
@@ -255,9 +255,11 @@ typedef void ( *SMP_Action_handler )( void *arg );
 /**
  * @brief Initiates an SMP multicast action to the set of target processors.
  *
- * The current processor may be part of the set.  In case a target processor is
- * in a wrong state to process per-processor jobs, then this function results
- * in an SMP_FATAL_WRONG_CPU_STATE_TO_PERFORM_JOBS fatal SMP error.
+ * The current processor may be part of the set.  The caller must ensure that
+ * no thread dispatch can happen during the call of this function, otherwise
+ * the behaviour is undefined.  In case a target processor is in a wrong state
+ * to process per-processor jobs, then this function results in an
+ * SMP_FATAL_WRONG_CPU_STATE_TO_PERFORM_JOBS fatal SMP error.
  *
  * @param targets The set of target processors for the action.
  * @param handler The multicast action handler.
diff --git a/cpukit/score/src/smpmulticastaction.c b/cpukit/score/src/smpmulticastaction.c
index f7dd503fae..a525289842 100644
--- a/cpukit/score/src/smpmulticastaction.c
+++ b/cpukit/score/src/smpmulticastaction.c
@@ -31,7 +31,6 @@
 
 #include <rtems/score/smpimpl.h>
 #include <rtems/score/assert.h>
-#include <rtems/score/threaddispatch.h>
 
 typedef struct Per_CPU_Job Per_CPU_Job;
 
@@ -178,8 +177,7 @@ static void _SMP_Issue_action_jobs(
 static void _SMP_Wait_for_action_jobs(
   const Processor_mask *targets,
   const Per_CPU_Jobs   *jobs,
-  uint32_t              cpu_max,
-  Per_CPU_Control      *cpu_self
+  uint32_t              cpu_max
 )
 {
   uint32_t cpu_index;
@@ -208,7 +206,7 @@ static void _SMP_Wait_for_action_jobs(
              * We have to perform our own jobs here in case inter-processor
              * interrupts are not working.
              */
-            _Per_CPU_Try_perform_jobs( cpu_self );
+            _Per_CPU_Try_perform_jobs( _Per_CPU_Get() );
             break;
           default:
             _SMP_Fatal( SMP_FATAL_WRONG_CPU_STATE_TO_PERFORM_JOBS );
@@ -225,30 +223,17 @@ void _SMP_Multicast_action(
   void                 *arg
 )
 {
-  Per_CPU_Jobs     jobs;
-  uint32_t         cpu_max;
-  Per_CPU_Control *cpu_self;
-  uint32_t         isr_level;
+  Per_CPU_Jobs jobs;
+  uint32_t     cpu_max;
 
   cpu_max = _SMP_Get_processor_maximum();
   _Assert( cpu_max <= CPU_MAXIMUM_PROCESSORS );
 
   jobs.handler = handler;
   jobs.arg = arg;
-  isr_level = _ISR_Get_level();
-
-  if ( isr_level == 0 ) {
-    cpu_self = _Thread_Dispatch_disable();
-  } else {
-    cpu_self = _Per_CPU_Get();
-  }
 
   _SMP_Issue_action_jobs( targets, &jobs, cpu_max );
-  _SMP_Wait_for_action_jobs( targets, &jobs, cpu_max, cpu_self );
-
-  if ( isr_level == 0 ) {
-    _Thread_Dispatch_enable( cpu_self );
-  }
+  _SMP_Wait_for_action_jobs( targets, &jobs, cpu_max );
 }
 
 void _SMP_Broadcast_action(