action: don't merge twice in read_from()

synchronize_with() already takes care of the clock vector merging, so don't
merge a second time.

diff --git a/action.cc b/action.cc
index 131cb74d7e821ba8c473499f0eed3e7eaf504191..5c036ef1cf92e8376ffa7958b0c2b3660f3f3d27 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -167,7 +167,6 @@ void ModelAction::read_from(const ModelAction *act)
        ASSERT(cv);
        if (act!=NULL && act->is_release() && this->is_acquire()) {
                synchronize_with(act);
-               cv->merge(act->cv);
        }
        reads_from = act;
 }