summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
Diffstat (limited to 'sim')
-rw-r--r--sim/process.hh2
-rw-r--r--sim/system.cc4
2 files changed, 2 insertions, 4 deletions
diff --git a/sim/process.hh b/sim/process.hh
index fc600fb06..476cb8ecf 100644
--- a/sim/process.hh
+++ b/sim/process.hh
@@ -48,7 +48,7 @@
#include "mem/page_table.hh"
#include "sim/sim_object.hh"
#include "sim/stats.hh"
-#include "targetarch/isa_traits.hh"
+#include "arch/isa_traits.hh"
class CPUExecContext;
class ExecContext;
diff --git a/sim/system.cc b/sim/system.cc
index 3ed7ed590..f1d0579d7 100644
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -1,7 +1,6 @@
#include "base/loader/object_file.hh"
#include "base/loader/symtab.hh"
#include "cpu/exec_context.hh"
-#include "arch/vtophys.hh"
#include "mem/memory.hh"
#include "sim/builder.hh"
#include "arch/isa_traits.hh"
@@ -12,7 +11,7 @@
#include "base/remote_gdb.hh"
#include "kern/kernel_stats.hh"
#include "mem/functional/memory_control.hh"
-#include "targetarch/vtophys.hh"
+#include "arch/vtophys.hh"
#endif
using namespace std;
@@ -72,7 +71,6 @@ System::System(Params *p)
DPRINTF(Loader, "Kernel entry = %#x\n", kernelEntry);
DPRINTF(Loader, "Kernel loaded...\n");
-#if FULL_SYSTEM
kernelBinning = new Kernel::Binning(this);
#endif // FULL_SYSTEM