diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-07-07 16:47:28 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-07-07 16:47:28 -0400 |
| commit | b2a479cfc89e3109830bd285b0819b6a0b56cbf4 (patch) | |
| tree | 32ea9fd57f6c2bf90c31e62fab7a755f65f408b9 /src/cpu/base.cc | |
| parent | 1faada9bd98a6425624a97813d4c8cdc5b78aa1f (diff) | |
| parent | 7811500eefc57d8f9f00845b9187d9a1a6ef6655 (diff) | |
| download | gem5-b2a479cfc89e3109830bd285b0819b6a0b56cbf4.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
--HG--
extra : convert_revision : e8933f852352164f4e50444f94cc6ee260e06766
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 { |