--- a/hotspot/src/os/bsd/vm/os_bsd.cpp	Fri Dec 18 13:38:49 2015 +0000
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp	Sun Dec 20 10:37:23 2015 -0500
@@ -3479,8 +3479,9 @@
   // Add in 2*BytesPerWord times page size to account for VM stack during
   // class initialization depending on 32 or 64 bit VM.
   os::Bsd::min_stack_allowed = MAX2(os::Bsd::min_stack_allowed,
-                                    (size_t)(StackReservedPages+StackYellowPages+StackRedPages+StackShadowPages+
-                                    2*BytesPerWord COMPILER2_PRESENT(+1)) * Bsd::page_size());
+                                    JavaThread::stack_guard_zone_size() +
+                                    JavaThread::stack_shadow_zone_size() +
+                                    2*BytesPerWord COMPILER2_PRESENT(+1) * Bsd::page_size());
 
   size_t threadStackSizeInBytes = ThreadStackSize * K;
   if (threadStackSizeInBytes != 0 &&