7 files changed, 9 insertions, 9 deletions

diff --git a/arch/alpha/alpha_memory.hh b/arch/alpha/alpha_memory.hh
index 88ea3ee94..9b7306bfd 100644
--- a/arch/alpha/alpha_memory.hh
+++ b/arch/alpha/alpha_memory.hh
@@ -31,7 +31,7 @@
 
 #include <map>
 
-#include "targetarch/mem_req.hh"
+#include "mem/mem_req.hh"
 #include "sim/sim_object.hh"
 #include "base/statistics.hh"
 
diff --git a/cpu/exec_context.hh b/cpu/exec_context.hh
index 817c72b3b..5c6e84cee 100644
--- a/cpu/exec_context.hh
+++ b/cpu/exec_context.hh
@@ -30,7 +30,7 @@
 #define __EXEC_CONTEXT_HH__
 
 #include "sim/host.hh"
-#include "targetarch/mem_req.hh"
+#include "mem/mem_req.hh"
 
 // forward declaration: see functional_memory.hh
 class FunctionalMemory;
diff --git a/cpu/pc_event.hh b/cpu/pc_event.hh
index 645138fdd..b425cc72c 100644
--- a/cpu/pc_event.hh
+++ b/cpu/pc_event.hh
@@ -31,7 +31,7 @@
 
 #include <vector>
 
-#include "targetarch/mem_req.hh"
+#include "mem/mem_req.hh"
 
 class ExecContext;
 class PCEventQueue;
diff --git a/kern/tru64/tru64_system.cc b/kern/tru64/tru64_system.cc
index 66eccf58c..8b4ff668d 100644
--- a/kern/tru64/tru64_system.cc
+++ b/kern/tru64/tru64_system.cc
@@ -43,7 +43,7 @@
 
 using namespace std;
 
-Tru64System::Tru64System(const string _name, const int _init_param,
+Tru64System::Tru64System(const string _name, const uint64_t _init_param,
                          MemoryController *_memCtrl, PhysicalMemory *_physmem,
                          const string &kernel_path, const string &console_path,
                          const string &palcode, const string &boot_osflags)
@@ -228,7 +228,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(Tru64System)
 
     SimObjectParam<MemoryController *> mem_ctl;
     SimObjectParam<PhysicalMemory *> physmem;
-    Param<int> init_param;
+    Param<uint64_t> init_param;
 
     Param<string> kernel_code;
     Param<string> console_code;
diff --git a/kern/tru64/tru64_system.hh b/kern/tru64/tru64_system.hh
index 5a583d62c..a67792aaf 100644
--- a/kern/tru64/tru64_system.hh
+++ b/kern/tru64/tru64_system.hh
@@ -79,7 +79,7 @@ class Tru64System : public System
 
   public:
     Tru64System(const std::string _name,
-                const int _init_param,
+                const uint64_t _init_param,
                 MemoryController *_memCtrl,
                 PhysicalMemory *_physmem,
                 const std::string &kernel_path,
diff --git a/sim/system.cc b/sim/system.cc
index 76c895a88..af4a4c151 100644
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -38,7 +38,7 @@ vector<System *> System::systemList;
 int System::numSystemsRunning = 0;
 
 System::System(const std::string _name,
-               const int _init_param,
+               const uint64_t _init_param,
                MemoryController *_memCtrl,
                PhysicalMemory *_physmem)
     : SimObject(_name),
diff --git a/sim/system.hh b/sim/system.hh
index 1c4440b9a..081aa3eb7 100644
--- a/sim/system.hh
+++ b/sim/system.hh
@@ -46,7 +46,7 @@ class ExecContext;
 class System : public SimObject
 {
   public:
-    const int init_param;
+    const uint64_t init_param;
     MemoryController *memCtrl;
     PhysicalMemory *physmem;
 
@@ -58,7 +58,7 @@ class System : public SimObject
     virtual void replaceExecContext(int xcIndex, ExecContext *xc);
 
   public:
-    System(const std::string _name, const int _init_param,
+    System(const std::string _name, const uint64_t _init_param,
            MemoryController *, PhysicalMemory *);
     ~System();