Merge zizzer:/z/m5/Bitkeeper/m5

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

--HG--
extra : convert_revision : db688679bfd9c670ef44611de71640c3bf564fc0

diff --cc cpu/base_cpu.cc
Simple merge

diff --cc cpu/base_cpu.hh
index 802da340b406da8d13a54f5577a5fe530909cc0b,dd1c7ac589e878994c30f20d8fa86caebb3d7c06..f346f4ec55f6ae6869ddd9632e867581a08f2c89
--- 1/cpu/base_cpu.hh
--- 2/cpu/base_cpu.hh
+++ b/cpu/base_cpu.hh
@@@ -112,12 -115,11 +116,11 @@@ class BaseCPU : public SimObjec
      virtual void init();
      virtual void regStats();
  
-     bool deferRegistration;
      void registerExecContexts();
  
 -    /// Prepare for another CPU to take over execution.  Called by
 -    /// takeOverFrom() on its argument.
 -    virtual void switchOut();
 +    /// Prepare for another CPU to take over execution.  When it is
 +    /// is ready (drained pipe) it signals the sampler.
 +    virtual void switchOut(SamplingCPU *);
  
      /// Take over execution from the given CPU.  Used for warm-up and
      /// sampling.

diff --cc cpu/simple_cpu/simple_cpu.cc
Simple merge

diff --cc cpu/simple_cpu/simple_cpu.hh
Simple merge