diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-07-14 17:54:43 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-07-14 17:54:43 -0400 |
| commit | 31ac8e733765ee37411d92ea3b7c308affef087a (patch) | |
| tree | f2b677c660d83978d9a9a83ca934c3d9bb1215ba /src/cpu/simple/atomic.hh | |
| parent | 138a4faf2894ff7d22585b8398ae87f8e6aad9a1 (diff) | |
| parent | 07186de5a1b1df55a31329b2ca9c53ad168438ff (diff) | |
| download | gem5-31ac8e733765ee37411d92ea3b7c308affef087a.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
configs/test/fs.py:
configs/test/test.py:
SCCS merged
--HG--
extra : convert_revision : 7b2dbcd5881fac01dec38001c4131e73b5be52b5
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 b602af558..895eb5bde 100644 --- a/src/cpu/simple/atomic.hh +++ b/src/cpu/simple/atomic.hh @@ -128,6 +128,7 @@ class AtomicSimpleCPU : public BaseSimpleCPU virtual void unserialize(Checkpoint *cp, const std::string §ion); virtual void resume(); + virtual void resume(); void switchOut(); void takeOverFrom(BaseCPU *oldCPU); |