diff options
Diffstat (limited to 'kern')
| -rw-r--r-- | kern/linux/linux_system.cc | 6 | ||||
| -rw-r--r-- | kern/system_events.cc | 6 | ||||
| -rw-r--r-- | kern/tru64/tru64_events.cc | 4 | ||||
| -rw-r--r-- | kern/tru64/tru64_system.cc | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/kern/linux/linux_system.cc b/kern/linux/linux_system.cc index 5fa72735c..afc9f1d93 100644 --- a/kern/linux/linux_system.cc +++ b/kern/linux/linux_system.cc @@ -38,12 +38,12 @@ #include "base/loader/symtab.hh" #include "base/trace.hh" #include "cpu/exec_context.hh" -#include "cpu/base_cpu.hh" +#include "cpu/base.hh" #include "kern/linux/linux_events.hh" #include "kern/linux/linux_system.hh" #include "kern/system_events.hh" -#include "mem/functional_mem/memory_control.hh" -#include "mem/functional_mem/physical_memory.hh" +#include "mem/functional/memory_control.hh" +#include "mem/functional/physical.hh" #include "sim/builder.hh" #include "dev/platform.hh" #include "targetarch/isa_traits.hh" diff --git a/kern/system_events.cc b/kern/system_events.cc index 9acf2f65a..eb21afcd1 100644 --- 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" diff --git a/kern/tru64/tru64_events.cc b/kern/tru64/tru64_events.cc index f4300116e..247b58558 100644 --- a/kern/tru64/tru64_events.cc +++ b/kern/tru64/tru64_events.cc @@ -27,12 +27,12 @@ */ #include "cpu/exec_context.hh" -#include "cpu/base_cpu.hh" +#include "cpu/base.hh" #include "kern/system_events.hh" #include "kern/tru64/tru64_events.hh" #include "kern/tru64/dump_mbuf.hh" #include "kern/tru64/printf.hh" -#include "mem/functional_mem/memory_control.hh" +#include "mem/functional/memory_control.hh" #include "targetarch/arguments.hh" #include "targetarch/isa_traits.hh" diff --git a/kern/tru64/tru64_system.cc b/kern/tru64/tru64_system.cc index e0ec31a43..6914a9c54 100644 --- a/kern/tru64/tru64_system.cc +++ b/kern/tru64/tru64_system.cc @@ -28,13 +28,13 @@ #include "base/loader/symtab.hh" #include "base/trace.hh" -#include "cpu/base_cpu.hh" +#include "cpu/base.hh" #include "cpu/exec_context.hh" #include "kern/tru64/tru64_events.hh" #include "kern/tru64/tru64_system.hh" #include "kern/system_events.hh" -#include "mem/functional_mem/memory_control.hh" -#include "mem/functional_mem/physical_memory.hh" +#include "mem/functional/memory_control.hh" +#include "mem/functional/physical.hh" #include "sim/builder.hh" #include "targetarch/isa_traits.hh" #include "targetarch/vtophys.hh" |