Index: /trunk/src/VBox/Runtime/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Runtime/Makefile.kmk	(revision 25665)
+++ /trunk/src/VBox/Runtime/Makefile.kmk	(revision 25666)
@@ -413,5 +413,5 @@
 	generic/RTSemMutexRequestDebug-generic.cpp \
 	generic/mppresent-generic.cpp \
-	generic/semrw-generic.cpp \
+	generic/semrw-$(if-expr defined(VBOX_WITH_LOCKLESS_SEMRW),lockless-,)generic.cpp \
 	generic/uuid-generic.cpp \
 	generic/RTProcIsRunningByName-generic.cpp \
@@ -525,5 +525,5 @@
 	generic/RTSemMutexRequest-generic.cpp \
 	generic/RTSemMutexRequestDebug-generic.cpp \
-	generic/semrw-generic.cpp \
+	generic/semrw-$(if-expr defined(VBOX_WITH_LOCKLESS_SEMRW),lockless-,)generic.cpp \
 	generic/timer-generic.cpp \
 	generic/utf16locale-generic.cpp \
@@ -569,5 +569,5 @@
 	generic/RTUuidCreate-generic.cpp \
 	generic/mppresent-generic.cpp \
-	generic/semrw-generic.cpp \
+	generic/semrw-$(if-expr defined(VBOX_WITH_LOCKLESS_SEMRW),lockless-,)generic.cpp \
 	generic/timer-generic.cpp \
 	generic/utf16locale-generic.cpp \
@@ -721,5 +721,5 @@
 	generic/RTSemMutexRequest-generic.cpp \
 	generic/RTSemMutexRequestDebug-generic.cpp \
-	generic/semrw-generic.cpp \
+	generic/semrw-$(if-expr defined(VBOX_WITH_LOCKLESS_SEMRW),lockless-,)generic.cpp \
 	generic/utf16locale-generic.cpp \
 	generic/uuid-generic.cpp \
Index: /trunk/src/VBox/Runtime/generic/semrw-lockless-generic.cpp
===================================================================
--- /trunk/src/VBox/Runtime/generic/semrw-lockless-generic.cpp	(revision 25665)
+++ /trunk/src/VBox/Runtime/generic/semrw-lockless-generic.cpp	(revision 25666)
@@ -288,4 +288,5 @@
                     if (RT_SUCCESS(rc))
 #else
+                    RTTHREAD hThreadSelf = RTThreadSelf();
                     RTThreadBlocking(hThreadSelf, RTTHREADSTATE_RW_READ, false);
 #endif
@@ -610,4 +611,5 @@
             if (RT_SUCCESS(rc))
 #else
+            RTTHREAD hThreadSelf = RTThreadSelf();
             RTThreadBlocking(hThreadSelf, RTTHREADSTATE_RW_WRITE, false);
 #endif