diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2005-06-05 02:59:44 -0400 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2005-06-05 02:59:44 -0400 |
| commit | 11f0c012075cd29a8cfd451c82f7134f79021fe1 (patch) | |
| tree | 0ef49a7fd382e657ace894b6ef56621c56837b9f /cpu/simple/cpu.cc | |
| parent | e71ee12eacb115289ce96f9a384dd2c0567270a7 (diff) | |
| parent | 550003e1b7a49798ff8154eae2355f298f35d346 (diff) | |
| download | gem5-11f0c012075cd29a8cfd451c82f7134f79021fe1.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/m5
into crampon.my.domain:/z/binkertn/research/m5/head
--HG--
extra : convert_revision : d46f23e63e4a8c6325bcdeaf6cdd76b9e6208707
Diffstat (limited to 'cpu/simple/cpu.cc')
| -rw-r--r-- | cpu/simple/cpu.cc | 2 |
1 files changed, 1 insertions, 1 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) { |