xnu-6153.61.1.tar.gz

[apple/xnu.git] / osfmk / kern / turnstile.c

diff --git a/osfmk/kern/turnstile.c b/osfmk/kern/turnstile.c
index 6375a3704da93dc0209f16689d87a0fa6588aa7c..e2b189dcb103207b98c9c256cdbd90abce582486 100644 (file)
--- a/osfmk/kern/turnstile.c
+++ b/osfmk/kern/turnstile.c
@@ -1896,9 +1896,8 @@ thread_get_waiting_turnstile(thread_t thread)
                return turnstile;
        }
 
-       /* Get the safeq if the waitq is a port queue */
-       if (waitq_is_port_queue(waitq)) {
-               waitq = waitq_get_safeq(waitq);
+       if (waitq_is_turnstile_proxy(waitq)) {
+               return waitq->waitq_ts;
        }
 
        /* Check if the waitq is a turnstile queue */
@@ -1952,8 +1951,11 @@ thread_get_update_flags_for_turnstile_propagation_stoppage(thread_t thread)
        }
 
        /* Get the safeq if the waitq is a port queue */
-       if (waitq_is_port_queue(waitq)) {
-               waitq = waitq_get_safeq(waitq);
+       if (waitq_is_turnstile_proxy(waitq)) {
+               if (waitq->waitq_ts) {
+                       return TSU_NO_PRI_CHANGE_NEEDED;
+               }
+               return TSU_NO_TURNSTILE;
        }
 
        /* Check if the waitq is a turnstile queue */