From: Brian Demsky <bdemsky@uci.edu>
Date: Wed, 19 Sep 2012 07:38:14 +0000 (-0700)
Subject: fix merge bug
X-Git-Tag: pldi2013~181
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=3f947091862fee454da7f8f2723d67733d581a7d

fix merge bug
---

diff --git a/model.cc b/model.cc
index 3fb3758..c57ddee 100644
--- a/model.cc
+++ b/model.cc
@@ -367,7 +367,7 @@ ModelAction * ModelChecker::initialize_curr_action(ModelAction *curr)
 		return newcurr;
 	}
 
-	newcurr = node_stack->explore_action(curr);
+	newcurr = node_stack->explore_action(curr, scheduler->get_enabled());
 	if (newcurr) {
 		/* First restore type and order in case of RMW operation */
 		if (curr->is_rmwr())