diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-07-07 15:58:22 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-07-07 15:58:22 -0400 |
| commit | 743737c28b4d29d2b6c1a80fc14e5bc6abcf6a60 (patch) | |
| tree | 898724a3714840ead898bd274c594566403fbf4d /src/cpu/base.cc | |
| parent | 74d4d671386252d0d5f570b69fc63cb332757580 (diff) | |
| parent | 76c110d924d2adfa209ad4302af791dfe6f67946 (diff) | |
| download | gem5-743737c28b4d29d2b6c1a80fc14e5bc6abcf6a60.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-o3
--HG--
extra : convert_revision : f97469b7d19c82deb3d068f80546d729757c25e3
Diffstat (limited to 'src/cpu/base.cc')
| -rw-r--r-- | src/cpu/base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/base.cc b/src/cpu/base.cc index 0b9c80591..548f012df 100644 --- a/src/cpu/base.cc +++ b/src/cpu/base.cc @@ -63,7 +63,7 @@ BaseCPU::BaseCPU(Params *p) params(p), number_of_threads(p->numberOfThreads), system(p->system) #else BaseCPU::BaseCPU(Params *p) - : SimObject(p->name), clock(p->clock), params(p), + : MemObject(p->name), clock(p->clock), params(p), number_of_threads(p->numberOfThreads), system(p->system) #endif { |