From 3f947091862fee454da7f8f2723d67733d581a7d Mon Sep 17 00:00:00 2001 From: Brian Demsky Date: Wed, 19 Sep 2012 00:38:14 -0700 Subject: [PATCH] fix merge bug --- model.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model.cc b/model.cc index 3fb3758e..c57ddeea 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()) -- 2.34.1