summaryrefslogtreecommitdiff
path: root/src/cpu/simple/atomic.hh
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-07-19 15:26:48 -0400
committerKevin Lim <ktlim@umich.edu>2006-07-19 15:26:48 -0400
commit0cedb23d3c9122c061c5c1837dfaf01f570e0733 (patch)
tree311e8c3fc45dd647ffa4ae0d5cc8feb70b40a489 /src/cpu/simple/atomic.hh
parent1fdf14dd5a6e58f71150d30257b2b6792200c811 (diff)
downloadgem5-0cedb23d3c9122c061c5c1837dfaf01f570e0733.tar.xz
Some minor compiling fixes.
src/cpu/o3/iew.hh: Non-debug compile fixes. src/cpu/simple/atomic.cc: src/cpu/simple/atomic.hh: Merge fix. --HG-- extra : convert_revision : 38081925d2b74d8f64acdb65dba94b2bf465b16a
Diffstat (limited to 'src/cpu/simple/atomic.hh')
-rw-r--r--src/cpu/simple/atomic.hh1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/cpu/simple/atomic.hh b/src/cpu/simple/atomic.hh
index 895eb5bde..b602af558 100644
--- a/src/cpu/simple/atomic.hh
+++ b/src/cpu/simple/atomic.hh
@@ -128,7 +128,6 @@ class AtomicSimpleCPU : public BaseSimpleCPU
virtual void unserialize(Checkpoint *cp, const std::string &section);
virtual void resume();
- virtual void resume();
void switchOut();
void takeOverFrom(BaseCPU *oldCPU);