summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2003-10-21 21:33:34 -0700
committerSteve Reinhardt <stever@eecs.umich.edu>2003-10-21 21:33:34 -0700
commitdf3130d2ed30181d97b56899677d0a4dd9a8ac66 (patch)
treeae7b57d919a8d3c920afde7244d5ea889ddbf21a /cpu
parent4709c41d741736f114a6fc5d34900b9f3b3bd893 (diff)
parentde29fec658f6107c20a00c9c30111b253afafeac (diff)
downloadgem5-df3130d2ed30181d97b56899677d0a4dd9a8ac66.tar.xz
Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG-- extra : convert_revision : 070e7eadc64a104c9b176f911b0f05ab999deb47
Diffstat (limited to 'cpu')
-rw-r--r--cpu/base_cpu.cc1
-rw-r--r--cpu/exetrace.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/cpu/base_cpu.cc b/cpu/base_cpu.cc
index 2e1d95d88..90e090d5e 100644
--- a/cpu/base_cpu.cc
+++ b/cpu/base_cpu.cc
@@ -34,6 +34,7 @@
#include "base/cprintf.hh"
#include "cpu/exec_context.hh"
#include "base/misc.hh"
+#include "sim/param.hh"
#include "sim/sim_events.hh"
using namespace std;
diff --git a/cpu/exetrace.cc b/cpu/exetrace.cc
index 01f50e675..c350288bc 100644
--- a/cpu/exetrace.cc
+++ b/cpu/exetrace.cc
@@ -29,6 +29,7 @@
#include <fstream>
#include <iomanip>
+#include "sim/param.hh"
#include "cpu/full_cpu/dyn_inst.hh"
#include "cpu/full_cpu/spec_state.hh"
#include "cpu/full_cpu/issue.hh"