summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/alpha/isa_desc2
-rw-r--r--cpu/pc_event.cc2
-rw-r--r--sim/sim_events.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/isa_desc b/arch/alpha/isa_desc
index 53f279b4e..c023405c8 100644
--- a/arch/alpha/isa_desc
+++ b/arch/alpha/isa_desc
@@ -26,7 +26,7 @@ let {{
#include "cpu/exec_context.hh"
#include "cpu/simple_cpu/simple_cpu.hh"
#include "cpu/full_cpu/spec_state.hh"
-#include "cpu/full_cpu/cpu.hh"
+#include "cpu/full_cpu/full_cpu.hh"
#include "cpu/exetrace.hh"
#include "sim/annotation.hh"
diff --git a/cpu/pc_event.cc b/cpu/pc_event.cc
index a275c2c41..4a037663c 100644
--- a/cpu/pc_event.cc
+++ b/cpu/pc_event.cc
@@ -42,8 +42,8 @@
#include "targetarch/pmap.h"
#include "kern/tru64/kernel.hh"
#include "mem/functional_mem/memory_control.hh"
-#include "cpu/full_cpu/cpu.hh"
#include "sim/system.hh"
+#include "cpu/base_cpu.hh"
#include "cpu/full_cpu/bpred.hh"
#endif
diff --git a/sim/sim_events.cc b/sim/sim_events.cc
index 98480e76b..b622cb14d 100644
--- a/sim/sim_events.cc
+++ b/sim/sim_events.cc
@@ -28,7 +28,7 @@
#include <string>
-#include "cpu/full_cpu/cpu.hh"
+#include "sim/param.hh"
#include "sim/eventq.hh"
#include "base/hostinfo.hh"
#include "sim/sim_events.hh"