--- a/hotspot/src/share/vm/runtime/thread.cpp	Fri Feb 26 16:40:55 2010 -0500
+++ b/hotspot/src/share/vm/runtime/thread.cpp	Tue Mar 02 12:09:40 2010 -0800
@@ -1637,6 +1637,9 @@
     JNIHandleBlock::release_block(block);
   }
 
+  // These have to be removed while this is still a valid thread.
+  remove_stack_guard_pages();
+
   if (UseTLAB) {
     tlab().make_parsable(true);  // retire TLAB, if any
   }