--- a/hotspot/src/share/vm/runtime/thread.cpp	Fri Aug 06 11:53:28 2010 -0700
+++ b/hotspot/src/share/vm/runtime/thread.cpp	Mon Aug 09 15:17:05 2010 -0700
@@ -807,7 +807,7 @@
 // should be revisited, and they should be removed if possible.
 
 bool Thread::is_lock_owned(address adr) const {
-  return (_stack_base >= adr && adr >= (_stack_base - _stack_size));
+  return on_local_stack(adr);
 }
 
 bool Thread::set_as_starting_thread() {