Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/head --HG-- extra : convert_revision : 8630b3771678b68d5cd12a61f7a4de2e3443a8d7
This commit is contained in:
commit
3b95161da8
3 changed files with 6 additions and 6 deletions
|
@ -79,7 +79,7 @@ BaseSimpleCPU::BaseSimpleCPU(Params *p)
|
||||||
/* asid */ 0);
|
/* asid */ 0);
|
||||||
#endif // !FULL_SYSTEM
|
#endif // !FULL_SYSTEM
|
||||||
|
|
||||||
thread->setStatus(ThreadContext::Suspended);
|
thread->setStatus(ThreadContext::Unallocated);
|
||||||
|
|
||||||
tc = thread->getTC();
|
tc = thread->getTC();
|
||||||
|
|
||||||
|
|
|
@ -221,10 +221,10 @@ SimpleThread::activate(int delay)
|
||||||
|
|
||||||
lastActivate = curTick;
|
lastActivate = curTick;
|
||||||
|
|
||||||
if (status() == ThreadContext::Unallocated) {
|
// if (status() == ThreadContext::Unallocated) {
|
||||||
cpu->activateWhenReady(tid);
|
// cpu->activateWhenReady(tid);
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
|
|
||||||
_status = ThreadContext::Active;
|
_status = ThreadContext::Active;
|
||||||
|
|
||||||
|
|
|
@ -792,7 +792,7 @@ class Tru64 : public OperatingSystem
|
||||||
for (int i = 0; i < process->numCpus(); ++i) {
|
for (int i = 0; i < process->numCpus(); ++i) {
|
||||||
ThreadContext *tc = process->threadContexts[i];
|
ThreadContext *tc = process->threadContexts[i];
|
||||||
|
|
||||||
if (tc->status() == ThreadContext::Suspended) {
|
if (tc->status() == ThreadContext::Unallocated) {
|
||||||
// inactive context... grab it
|
// inactive context... grab it
|
||||||
init_thread_context(tc, attrp, uniq_val);
|
init_thread_context(tc, attrp, uniq_val);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue