diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-07-12 17:21:25 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-07-12 17:21:25 -0400 |
| commit | 6dfaf06edf53eb80af8d2a5b1722fb399cdb814d (patch) | |
| tree | 324b900cf01185923ef36d31b177fb1d97db5289 /src/cpu/simple/atomic.hh | |
| parent | bbfe1db6b3d96e5bbf8fe91a494cf60eceae68ad (diff) | |
| parent | 6f81ae5cade20f855831065e31355e11eb2b9182 (diff) | |
| download | gem5-6dfaf06edf53eb80af8d2a5b1722fb399cdb814d.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
configs/test/test.py:
Hand merge.
--HG--
extra : convert_revision : e3fce9cf50a65a9400cd3ec887b13e4765274ec2
Diffstat (limited to 'src/cpu/simple/atomic.hh')
| -rw-r--r-- | src/cpu/simple/atomic.hh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cpu/simple/atomic.hh b/src/cpu/simple/atomic.hh index 179b4a721..b602af558 100644 --- a/src/cpu/simple/atomic.hh +++ b/src/cpu/simple/atomic.hh @@ -126,6 +126,7 @@ class AtomicSimpleCPU : public BaseSimpleCPU virtual void serialize(std::ostream &os); virtual void unserialize(Checkpoint *cp, const std::string §ion); + virtual void resume(); void switchOut(); void takeOverFrom(BaseCPU *oldCPU); |