--- a/hotspot/src/share/vm/prims/whitebox.cpp	Fri Dec 18 13:38:49 2015 +0000
+++ b/hotspot/src/share/vm/prims/whitebox.cpp	Sun Dec 20 10:37:23 2015 -0500
@@ -1201,7 +1201,7 @@
 
 WB_ENTRY(jlong, WB_GetThreadRemainingStackSize(JNIEnv* env, jobject o))
   JavaThread* t = JavaThread::current();
-  return (jlong) t->stack_available(os::current_stack_pointer()) - (jlong) StackShadowPages * os::vm_page_size();
+  return (jlong) t->stack_available(os::current_stack_pointer()) - (jlong)JavaThread::stack_shadow_zone_size();
 WB_END