diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2007-04-16 11:32:09 -0400 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2007-04-16 11:32:09 -0400 |
| commit | 3b95161da834baa0d1bd635934ed308c2ec03632 (patch) | |
| tree | ffe78bac9a5c864ec0b77274fc0095bffe0f866d /src | |
| parent | 68221b708c03abd958105afc2983190aa91f0108 (diff) | |
| parent | 2952c34096357dffc207778ea1b73e71387ac010 (diff) | |
| download | gem5-3b95161da834baa0d1bd635934ed308c2ec03632.tar.xz | |
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/head
--HG--
extra : convert_revision : 8630b3771678b68d5cd12a61f7a4de2e3443a8d7
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpu/simple/base.cc | 2 | ||||
| -rw-r--r-- | src/cpu/simple_thread.cc | 8 | ||||
| -rw-r--r-- | src/kern/tru64/tru64.hh | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc index 877dc5bd4..4fed2059b 100644 --- a/src/cpu/simple/base.cc +++ b/src/cpu/simple/base.cc @@ -79,7 +79,7 @@ BaseSimpleCPU::BaseSimpleCPU(Params *p) /* asid */ 0); #endif // !FULL_SYSTEM - thread->setStatus(ThreadContext::Suspended); + thread->setStatus(ThreadContext::Unallocated); tc = thread->getTC(); diff --git a/src/cpu/simple_thread.cc b/src/cpu/simple_thread.cc index 39f31782b..191ae2f2e 100644 --- a/src/cpu/simple_thread.cc +++ b/src/cpu/simple_thread.cc @@ -221,10 +221,10 @@ SimpleThread::activate(int delay) lastActivate = curTick; - if (status() == ThreadContext::Unallocated) { - cpu->activateWhenReady(tid); - return; - } +// if (status() == ThreadContext::Unallocated) { +// cpu->activateWhenReady(tid); +// return; +// } _status = ThreadContext::Active; diff --git a/src/kern/tru64/tru64.hh b/src/kern/tru64/tru64.hh index b94276035..a7703be7c 100644 --- a/src/kern/tru64/tru64.hh +++ b/src/kern/tru64/tru64.hh @@ -792,7 +792,7 @@ class Tru64 : public OperatingSystem for (int i = 0; i < process->numCpus(); ++i) { ThreadContext *tc = process->threadContexts[i]; - if (tc->status() == ThreadContext::Suspended) { + if (tc->status() == ThreadContext::Unallocated) { // inactive context... grab it init_thread_context(tc, attrp, uniq_val); |