From: Ron Dreslinski <rdreslin@umich.edu>
Date: Mon, 21 Feb 2005 21:50:38 +0000 (-0500)
Subject: Merge zizzer:/z/m5/Bitkeeper/m5
X-Git-Tag: m5_1.0_tutorial~87
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9dd1ab1dba6f72f11ce4985a166cb1327eee3551;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 : db688679bfd9c670ef44611de71640c3bf564fc0
---

9dd1ab1dba6f72f11ce4985a166cb1327eee3551
diff --cc cpu/base_cpu.hh
index 802da340b,dd1c7ac58..f346f4ec5
--- a/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.