diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2007-05-28 08:13:40 -0700 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2007-05-28 08:13:40 -0700 |
| commit | 05915ed6f7e9f1f73f07d24bcb304f938fdc3d30 (patch) | |
| tree | 16deb0db75e15838f1f9db9704c79cb772bcf677 /src/cpu | |
| parent | 075f4b108a325e9cf2b903cd17fdbcac7598b6b0 (diff) | |
| parent | 41f6cbce9aa24f9cd8a6eb4a340dcc2e9671cdcb (diff) | |
| download | gem5-05915ed6f7e9f1f73f07d24bcb304f938fdc3d30.tar.xz | |
Merge vm1.(none):/home/stever/bk/newmem-head
into vm1.(none):/home/stever/bk/newmem-cache2
--HG--
extra : convert_revision : 6f462916cb0eb309b6799e94fbf07629abb50eba
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/ozone/cpu_impl.hh | 1 | ||||
| -rw-r--r-- | src/cpu/simple_thread.hh | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/cpu/ozone/cpu_impl.hh b/src/cpu/ozone/cpu_impl.hh index d78162243..d1214223b 100644 --- a/src/cpu/ozone/cpu_impl.hh +++ b/src/cpu/ozone/cpu_impl.hh @@ -53,7 +53,6 @@ #include "arch/vtophys.hh" #include "base/callback.hh" #include "cpu/profile.hh" -#include "mem/physical.hh" #include "sim/faults.hh" #include "sim/sim_events.hh" #include "sim/sim_exit.hh" diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh index 824914ad0..95848ee2c 100644 --- a/src/cpu/simple_thread.hh +++ b/src/cpu/simple_thread.hh @@ -38,7 +38,6 @@ #include "config/full_system.hh" #include "cpu/thread_context.hh" #include "cpu/thread_state.hh" -#include "mem/physical.hh" #include "mem/request.hh" #include "sim/byteswap.hh" #include "sim/eventq.hh" |