Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5

[gem5.git] / sim / param.hh

diff --git a/sim/param.hh b/sim/param.hh
index 6706820c258048f57538360bafb9c7ad25d26074..ac57afa311208e07373c53e2482d95d900c2c649 100644 (file)
--- a/sim/param.hh
+++ b/sim/param.hh
@@ -34,6 +34,7 @@
 #include <vector>
 
 #include "sim/configfile.hh"
+#include "sim/startup.hh"
 
 // forward decls
 class BaseParam;
@@ -44,7 +45,7 @@ class SimObject;
 // SimObjectBuilder (which derives from ParamContext), but abstracted
 // here to support more global simulator control parameters as well.
 //
-class ParamContext
+class ParamContext : protected StartupCallback
 {
   private: