*** old/src/share/vm/runtime/mutex.cpp	Fri Jan 18 13:54:07 2013
--- new/src/share/vm/runtime/mutex.cpp	Fri Jan 18 13:54:07 2013

*** 1310,1321 ****
--- 1310,1322 ----
        //   already hold Terminator_lock - may happen because of periodic safepoints
        if (this->rank() != Mutex::native &&
            this->rank() != Mutex::suspend_resume &&
            locks != NULL && locks->rank() <= this->rank() &&
            !SafepointSynchronize::is_at_safepoint() &&
-           this != Interrupt_lock && this != ProfileVM_lock &&
            !(this == Safepoint_lock && contains(locks, Terminator_lock) &&
+             && !(this == Safepoint_lock
+             && contains(locks, Terminator_lock) &&
              SafepointSynchronize::is_synchronizing())) {
          new_owner->print_owned_locks();
          fatal(err_msg("acquiring lock %s/%d out of order with lock %s/%d -- "
                        "possible deadlock", this->name(), this->rank(),
                        locks->name(), locks->rank()));