summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2006-06-13 12:07:48 -0400
committerKorey Sewell <ksewell@umich.edu>2006-06-13 12:07:48 -0400
commite715e298e044af3727423b27d08327d72b2d74fa (patch)
tree8697f35bd5db42556b5e56c46ca291df43752c08 /src/cpu
parent07f21ce9134cd0f8a1330f70d6068a028a5ced41 (diff)
parent7bcab0803fcb5055832d4858fe84d671c1a79d89 (diff)
downloadgem5-e715e298e044af3727423b27d08327d72b2d74fa.tar.xz
Merge zizzer:/bk/newmem
into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-release --HG-- extra : convert_revision : 78ef94172884c2db0f591c54657b28be5be7f61c
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/checker/cpu.cc1
-rw-r--r--src/cpu/o3/lsq_unit_impl.hh1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/cpu/checker/cpu.cc b/src/cpu/checker/cpu.cc
index ebc02f7be..37c5a3aa2 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>