--- a/hotspot/src/share/vm/prims/jvm.cpp	Fri Jul 04 11:46:01 2014 +0200
+++ b/hotspot/src/share/vm/prims/jvm.cpp	Mon Jul 14 10:15:21 2014 -0400
@@ -3043,7 +3043,7 @@
   if (ConvertYieldToSleep) {
     os::sleep(thread, MinSleepInterval, false);
   } else {
-    os::yield();
+    os::naked_yield();
   }
 JVM_END
 
@@ -3073,7 +3073,7 @@
     // It appears that in certain GUI contexts, it may be beneficial to do a short sleep
     // for SOLARIS
     if (ConvertSleepToYield) {
-      os::yield();
+      os::naked_yield();
     } else {
       ThreadState old_state = thread->osthread()->get_state();
       thread->osthread()->set_state(SLEEPING);