diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-03-09 18:32:13 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-03-09 18:32:13 -0500 |
| commit | df1ea2cf05e41c0be33eeb9f91c3adfb985005c2 (patch) | |
| tree | 0c9c9001bcedaa8ae986bbc638a92d1465cc89a9 /src/cpu/base.hh | |
| parent | f1e3e1c3053866f63f3826126260f43bf0c7d0c7 (diff) | |
| parent | dc4d47bad4f95501ebd144dc4aa53aa17563abcc (diff) | |
| download | gem5-df1ea2cf05e41c0be33eeb9f91c3adfb985005c2.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into zower.eecs.umich.edu:/home/gblack/m5/newmem-statetrace
--HG--
extra : convert_revision : 82a956ffc1bedb2c0d05c4ea3469f843f559a475
Diffstat (limited to 'src/cpu/base.hh')
| -rw-r--r-- | src/cpu/base.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/base.hh b/src/cpu/base.hh index d4213887d..7167bfde0 100644 --- a/src/cpu/base.hh +++ b/src/cpu/base.hh @@ -196,7 +196,7 @@ class BaseCPU : public MemObject /// Take over execution from the given CPU. Used for warm-up and /// sampling. - virtual void takeOverFrom(BaseCPU *); + virtual void takeOverFrom(BaseCPU *, Port *ic, Port *dc); /** * Number of threads we're actually simulating (<= SMT_MAX_THREADS). |