--- a/hotspot/src/share/vm/runtime/javaCalls.cpp	Fri Dec 11 13:18:10 2015 +0000
+++ b/hotspot/src/share/vm/runtime/javaCalls.cpp	Fri Dec 11 09:07:07 2015 -0800
@@ -371,9 +371,9 @@
   // Find receiver
   Handle receiver = (!method->is_static()) ? args->receiver() : Handle();
 
-  // When we reenter Java, we need to reenable the yellow zone which
+  // When we reenter Java, we need to reenable the reserved/yellow zone which
   // might already be disabled when we are in VM.
-  if (thread->stack_yellow_zone_disabled()) {
+  if (!thread->stack_guards_enabled()) {
     thread->reguard_stack();
   }