From acc524bb1a039c2230f5588e27c9b0da5666d801 Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Wed, 18 Apr 2012 12:36:58 -0700
Subject: [PATCH] libthreads: only record 'final' even for thrd_join

---
 libthreads.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libthreads.cc b/libthreads.cc
index a43505e..86a95e6 100644
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -22,8 +22,9 @@ int thrd_join(thrd_t t)
 	int ret = 0;
 	Thread *th = model->get_thread(thrd_to_id(t));
 	while (th->get_state() != THREAD_COMPLETED && !ret)
-		/* seq_cst is just a 'don't care' parameter */
-		ret = model->switch_to_master(new ModelAction(THREAD_JOIN, memory_order_seq_cst, NULL, VALUE_NONE));
+		ret = model->switch_to_master(NULL);
+	/* seq_cst is just a 'don't care' parameter */
+	ret = model->switch_to_master(new ModelAction(THREAD_JOIN, memory_order_seq_cst, NULL, VALUE_NONE));
 	return ret;
 }
 
-- 
2.34.1