diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-06-13 11:58:05 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-06-13 11:58:05 -0400 |
| commit | 66af2a7bf4c82cb90fde5d3a796bbe2cad9ed560 (patch) | |
| tree | b8efa634a5e192be3987a7015a133c542fa2d8a3 | |
| parent | 6ee38f143ec8796b819a1db901828a4903607c19 (diff) | |
| parent | 7bcab0803fcb5055832d4858fe84d671c1a79d89 (diff) | |
| download | gem5-66af2a7bf4c82cb90fde5d3a796bbe2cad9ed560.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/clean/newmem-merge
--HG--
extra : convert_revision : 1a00a3970c6064cb59cd2f788094569fc431bf70
| -rw-r--r-- | src/cpu/checker/cpu.cc | 1 | ||||
| -rw-r--r-- | src/cpu/o3/lsq_unit_impl.hh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/cpu/checker/cpu.cc b/src/cpu/checker/cpu.cc index b1167c1d8..6971ab37f 100644 --- a/src/cpu/checker/cpu.cc +++ b/src/cpu/checker/cpu.cc @@ -38,6 +38,7 @@ #include "cpu/simple_thread.hh" #include "cpu/thread_context.hh" #include "cpu/static_inst.hh" +#include "mem/packet_impl.hh" #include "sim/byteswap.hh" #include "sim/sim_object.hh" #include "sim/stats.hh" diff --git a/src/cpu/o3/lsq_unit_impl.hh b/src/cpu/o3/lsq_unit_impl.hh index 6f32ec304..4c01f29a2 100644 --- a/src/cpu/o3/lsq_unit_impl.hh +++ b/src/cpu/o3/lsq_unit_impl.hh @@ -32,6 +32,7 @@ #include "cpu/checker/cpu.hh" #include "cpu/o3/lsq_unit.hh" #include "base/str.hh" +#include "mem/packet.hh" #include "mem/request.hh" template<class Impl> |