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

[gem5.git] / kern / system_events.cc

diff --git a/kern/system_events.cc b/kern/system_events.cc
index 9acf2f65a38fd27ca35486233f8e4f611691ee6e..eb21afcd1dce3dc89fe91308a3b25d6b55de9b26 100644 (file)
--- a/kern/system_events.cc
+++ b/kern/system_events.cc
@@ -27,9 +27,9 @@
  */
 
 #include "cpu/exec_context.hh"
-#include "cpu/base_cpu.hh"
-#include "cpu/full_cpu/bpred.hh"
-#include "cpu/full_cpu/full_cpu.hh"
+#include "cpu/base.hh"
+#include "encumbered/cpu/full/bpred.hh"
+#include "encumbered/cpu/full/cpu.hh"
 #include "kern/kernel_stats.hh"
 #include "kern/system_events.hh"
 #include "sim/system.hh"