--- a/hotspot/src/share/vm/runtime/arguments.cpp	Thu Jan 26 14:14:55 2012 -0800
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Fri Jan 27 09:04:57 2012 +0100
@@ -3164,6 +3164,9 @@
   if (!UseBiasedLocking || EmitSync != 0) {
     UseOptoBiasInlining = false;
   }
+  if (!EliminateLocks) {
+    EliminateNestedLocks = false;
+  }
 #endif
 
   if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) {