fix merge bug
authorBrian Demsky <bdemsky@uci.edu>
Wed, 19 Sep 2012 07:38:14 +0000 (00:38 -0700)
committerBrian Demsky <bdemsky@uci.edu>
Wed, 19 Sep 2012 07:38:14 +0000 (00:38 -0700)
model.cc

index 3fb3758..c57ddee 100644 (file)
--- 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())