From: Ron Dreslinski <rdreslin@umich.edu>
Date: Thu, 17 Feb 2005 17:14:04 +0000 (-0500)
Subject: Merge zizzer:/z/m5/Bitkeeper/m5
X-Git-Tag: m5_1.0_tutorial~91
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=45ef238e3f54bd7e2b602def187085bd0b99aab5;p=gem5.git

Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1

--HG--
extra : convert_revision : 88afcacc41f5b0fae0ed1ac1821b7ca88c407e85
---

45ef238e3f54bd7e2b602def187085bd0b99aab5
diff --cc cpu/base_cpu.cc
index 4325bfc17,425ac8877..59804c7d5
--- a/cpu/base_cpu.cc
+++ b/cpu/base_cpu.cc
@@@ -33,9 -33,9 +33,10 @@@
  #include "base/cprintf.hh"
  #include "base/loader/symtab.hh"
  #include "base/misc.hh"
+ #include "base/output.hh"
  #include "cpu/base_cpu.hh"
  #include "cpu/exec_context.hh"
 +#include "cpu/sampling_cpu/sampling_cpu.hh"
  #include "sim/param.hh"
  #include "sim/sim_events.hh"