score: _CORE_message_queue_Close()

Move lock acquire to caller of _CORE_message_queue_Close() to allow
state checks during object close operations under lock protection.
Ensures deletion safety on uni-processor configuration.

1 files changed, 4 insertions, 6 deletions

diff --git a/cpukit/score/src/coremsgclose.c b/cpukit/score/src/coremsgclose.c
index 7184b11bfa..5b534312e7 100644
--- a/cpukit/score/src/coremsgclose.c
+++ b/cpukit/score/src/coremsgclose.c
@@ -33,29 +33,27 @@ static Thread_Control *_CORE_message_queue_Was_deleted(
 }
 
 void _CORE_message_queue_Do_close(
-  CORE_message_queue_Control *the_message_queue
+  CORE_message_queue_Control *the_message_queue,
 #if defined(RTEMS_MULTIPROCESSING)
-  ,
   Thread_queue_MP_callout     mp_callout,
-  Objects_Id                  mp_id
+  Objects_Id                  mp_id,
 #endif
+  ISR_lock_Context           *lock_context
 )
 {
-  ISR_lock_Context lock_context;
 
   /*
    *  This will flush blocked threads whether they were blocked on
    *  a send or receive.
    */
 
-  _CORE_message_queue_Acquire( the_message_queue, &lock_context );
   _Thread_queue_Flush_critical(
     &the_message_queue->Wait_queue.Queue,
     the_message_queue->operations,
     _CORE_message_queue_Was_deleted,
     mp_callout,
     mp_id,
-    &lock_context
+    lock_context
   );
 
   (void) _Workspace_Free( the_message_queue->message_buffers );