--- old/src/share/vm/jvmci/jvmciRuntime.cpp	2015-11-23 18:20:57.912621878 +0100
+++ new/src/share/vm/jvmci/jvmciRuntime.cpp	2015-11-23 18:20:57.721602672 +0100
@@ -244,7 +244,7 @@
   // Check the stack guard pages and reenable them if necessary and there is
   // enough space on the stack to do so.  Use fast exceptions only if the guard
   // pages are enabled.
-  bool guard_pages_enabled = thread->stack_yellow_zone_enabled();
+  bool guard_pages_enabled = thread->stack_guards_enabled();
   if (!guard_pages_enabled) guard_pages_enabled = thread->reguard_stack();
 
   if (JvmtiExport::can_post_on_exceptions()) {