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/base.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/base.cc')
-rw-r--r-- | cpu/base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/base.cc b/cpu/base.cc index 91ddc165e..38431006e 100644 --- a/cpu/base.cc +++ b/cpu/base.cc @@ -203,7 +203,7 @@ BaseCPU::registerExecContexts() void -BaseCPU::switchOut(SamplingCPU *sampler) +BaseCPU::switchOut(Sampler *sampler) { panic("This CPU doesn't support sampling!"); } |