Index: kernel/generic/src/proc/thread.c
===================================================================
--- kernel/generic/src/proc/thread.c	(revision 6eef3c4403b57fc01e6b79237e6cc0a6a6a7d016)
+++ kernel/generic/src/proc/thread.c	(revision 6e09bee82d4faee737b1447a893972ba497a3a3e)
@@ -277,5 +277,5 @@
 	
 	cpu_t *cpu;
-	if (thread->wired) {
+	if (thread->wired || thread->nomigrate || thread->fpu_context_engaged) {
 		ASSERT(thread->cpu != NULL);
 		cpu = thread->cpu;