Merge ktlim@zizzer.eecs.umich.edu:/bk/m5

into zamp.eecs.umich.edu:/z/ktlim2/m5

--HG--
extra : convert_revision : 0baadd8d68bfa6f8e96307eb2d4426b0d9e0b8b4

1 files changed, 5 insertions, 3 deletions

diff --git a/sim/system.hh b/sim/system.hh
index 07881ff01..4f003f282 100644
--- a/sim/system.hh
+++ b/sim/system.hh
@@ -37,14 +37,15 @@
 #include "kern/system_events.hh"
 #include "sim/sim_object.hh"
 
+class BaseCPU;
+class ExecContext;
+class GDBListener;
 class MemoryController;
+class ObjectFile;
 class PhysicalMemory;
 class Platform;
 class RemoteGDB;
-class GDBListener;
 class SymbolTable;
-class ObjectFile;
-class ExecContext;
 namespace Kernel { class Binning; }
 
 class System : public SimObject
@@ -101,6 +102,7 @@ class System : public SimObject
     struct Params
     {
         std::string name;
+        Tick boot_cpu_frequency;
         MemoryController *memctrl;
         PhysicalMemory *physmem;
         uint64_t init_param;