Changeset 349e510d in mainline for kernel/generic/src/proc/thread.c

Timestamp:

2012-06-27T20:34:18Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ae49252

Parents:

02dcb20 (diff), baf8fbb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/generic/src/proc/thread.c (modified) (1 diff)

kernel/generic/src/proc/thread.c

@@ -277 +277 @@
         
         cpu_t *cpu;
-        if (thread->wired) {
+        if (thread->wired || thread->nomigrate || thread->fpu_context_engaged) {
                 ASSERT(thread->cpu != NULL);
                 cpu = thread->cpu;