1 files changed, 44 insertions, 27 deletions

diff --git a/cpukit/score/src/threadqextractwithproxy.c b/cpukit/score/src/threadqextractwithproxy.c
index 1370aecb86..9225d3eda6 100644
--- a/cpukit/score/src/threadqextractwithproxy.c
+++ b/cpukit/score/src/threadqextractwithproxy.c
@@ -1,51 +1,68 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /**
  * @file
  *
  * @ingroup RTEMSScoreThreadQueue
  *
  * @brief This source file contains the implementation of
- *   _Thread_queue_Extract_with_proxy().
+ *   _Thread_MP_Extract_proxy().
  */
 
 /*
  *  COPYRIGHT (c) 1989-2012.
  *  On-Line Applications Research Corporation (OAR).
  *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <rtems/score/threadqimpl.h>
+#include <rtems/score/threadimpl.h>
 #include <rtems/score/objectimpl.h>
 #include <rtems/score/statesimpl.h>
 
-void _Thread_queue_Extract_with_proxy(
-  Thread_Control       *the_thread
-)
+void _Thread_MP_Extract_proxy( Thread_Control *the_thread )
 {
-  #if defined(RTEMS_MULTIPROCESSING)
-    States_Control state;
-
-    state = the_thread->current_state;
-    if ( _States_Is_waiting_for_rpc_reply( state ) &&
-         _States_Is_locally_blocked( state ) ) {
-      Objects_Id                            id;
-      Objects_Information                  *the_information;
-      Objects_Thread_queue_Extract_callout  proxy_extract_callout;
-
-      id = the_thread->Wait.remote_id;
-      the_information = _Objects_Get_information_id( id );
-      proxy_extract_callout = the_information->extract;
-
-      if ( proxy_extract_callout != NULL )
-        (*proxy_extract_callout)( the_thread, id );
-    }
-  #endif
+  States_Control state;
+
+  state = the_thread->current_state;
 
-  _Thread_queue_Extract( the_thread );
+  if (
+    _States_Is_waiting_for_rpc_reply( state ) &&
+    _States_Is_locally_blocked( state )
+  ) {
+    Objects_Id                            id;
+    const Objects_Information            *the_information;
+    Objects_Thread_queue_Extract_callout  proxy_extract_callout;
+
+    id = the_thread->Wait.remote_id;
+    the_information = _Objects_Get_information_id( id );
+    proxy_extract_callout = the_information->extract;
+
+    if ( proxy_extract_callout != NULL ) {
+      ( *proxy_extract_callout )( the_thread, id );
+    }
+  }
 }