1 files changed, 22 insertions, 24 deletions
diff --git a/cpukit/score/src/threadqextractwithproxy.c b/cpukit/score/src/threadqextractwithproxy.c
index 1370aecb86..a61934a2b1 100644
--- a/cpukit/score/src/threadqextractwithproxy.c
+++ b/cpukit/score/src/threadqextractwithproxy.c
@@ -4,7 +4,7 @@
  * @ingroup RTEMSScoreThreadQueue
  *
  * @brief This source file contains the implementation of
- *   _Thread_queue_Extract_with_proxy().
+ *   _Thread_MP_Extract_proxy().
  */
 
 /*
@@ -20,32 +20,30 @@
 #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;
+
+  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;
 
-  _Thread_queue_Extract( the_thread );
+    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 );
+    }
+  }
 }