--- a/hotspot/src/cpu/x86/vm/interp_masm_x86.cpp	Fri Aug 12 00:19:44 2016 -0400
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86.cpp	Fri Aug 12 08:46:17 2016 -0700
@@ -1071,6 +1071,9 @@
 
     NOT_LP64(get_thread(rthread);)
 
+    cmpl(Address(rthread, JavaThread::stack_guard_state_offset()), JavaThread::stack_guard_enabled);
+    jcc(Assembler::equal, no_reserved_zone_enabling);
+
     cmpptr(rbx, Address(rthread, JavaThread::reserved_stack_activation_offset()));
     jcc(Assembler::lessEqual, no_reserved_zone_enabling);