Merge with head, hopefully the last time for this batch.
This commit is contained in:
@@ -122,7 +122,7 @@ InOrderThreadContext::suspend(int delay)
|
||||
return;
|
||||
|
||||
thread->setStatus(ThreadContext::Suspended);
|
||||
cpu->suspendContext(thread->threadId(), delay);
|
||||
cpu->suspendContext(thread->threadId());
|
||||
}
|
||||
|
||||
void
|
||||
@@ -135,7 +135,7 @@ InOrderThreadContext::halt(int delay)
|
||||
return;
|
||||
|
||||
thread->setStatus(ThreadContext::Halted);
|
||||
cpu->haltContext(thread->threadId(), delay);
|
||||
cpu->haltContext(thread->threadId());
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user