From f1ba5c8c393c310e2210cbfb74020bec67fa6934 Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Mon, 15 Apr 2013 17:26:24 -0700
Subject: [PATCH] action: we don't need special cases for lock/join anymore

---
 action.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.cc b/action.cc
index bd98f5c..76f18dd 100644
--- a/action.cc
+++ b/action.cc
@@ -499,7 +499,7 @@ void ModelAction::set_read_from_promise(Promise *promise)
  */
 bool ModelAction::synchronize_with(const ModelAction *act)
 {
-	if (*this < *act && type != THREAD_JOIN && type != ATOMIC_LOCK)
+	if (*this < *act)
 		return false;
 	model->check_promises(act->get_tid(), cv, act->cv);
 	cv->merge(act->cv);
-- 
2.34.1