diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-04-06 15:00:11 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-04-06 15:00:11 -0400 |
| commit | 6a962f8343d0e7f138baa4034633c986eecc9edf (patch) | |
| tree | f16fdcc7455b0e7cd14af660ebdeb029db3c669a /sim/process.cc | |
| parent | 3124c5b7bb0cdcb3b16b52533c6a3e50a5970152 (diff) | |
| parent | 6240f8c4bcf12e3367905adfba066bb14f79262a (diff) | |
| download | gem5-6a962f8343d0e7f138baa4034633c986eecc9edf.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision : bd6352647798275a12d52d55a129cdddd8e25423
Diffstat (limited to 'sim/process.cc')
| -rw-r--r-- | sim/process.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sim/process.cc b/sim/process.cc index b483c70dc..4e4a54572 100644 --- a/sim/process.cc +++ b/sim/process.cc @@ -39,7 +39,7 @@ #include "config/full_system.hh" #include "cpu/exec_context.hh" #include "mem/page_table.hh" -#include "mem/mem_object.hh" +#include "mem/physical.hh" #include "mem/translating_port.hh" #include "sim/builder.hh" #include "sim/process.hh" |