Merge zizzer.eecs.umich.edu:/bk/m5

into crampon.my.domain:/z/binkertn/research/m5/head

--HG--
extra : convert_revision : d46f23e63e4a8c6325bcdeaf6cdd76b9e6208707

2 files changed, 3 insertions, 3 deletions

diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc
index d16993c5c..b145e1bbd 100644
--- a/cpu/simple/cpu.cc
+++ b/cpu/simple/cpu.cc
@@ -147,7 +147,7 @@ SimpleCPU::~SimpleCPU()
 }
 
 void
-SimpleCPU::switchOut(SamplingCPU *s)
+SimpleCPU::switchOut(Sampler *s)
 {
     sampler = s;
     if (status() == DcacheMissStall) {
diff --git a/cpu/simple/cpu.hh b/cpu/simple/cpu.hh
index 9a0c2952a..1d2ca79cb 100644
--- a/cpu/simple/cpu.hh
+++ b/cpu/simple/cpu.hh
@@ -145,7 +145,7 @@ class SimpleCPU : public BaseCPU
     // execution context
     ExecContext *xc;
 
-    void switchOut(SamplingCPU *s);
+    void switchOut(Sampler *s);
     void takeOverFrom(BaseCPU *oldCPU);
 
 #ifdef FULL_SYSTEM
@@ -169,7 +169,7 @@ class SimpleCPU : public BaseCPU
     // Pointer to the sampler that is telling us to switchover.
     // Used to signal the completion of the pipe drain and schedule
     // the next switchover
-    SamplingCPU *sampler;
+    Sampler *sampler;
 
     StaticInstPtr<TheISA> curStaticInst;