Merge tag 'v3.16' into p/abusse/merge_upgrade
[projects/modsched/linux.git] / kernel / kthread.c
index c2390f4..eb76180 100644 (file)
@@ -206,6 +206,7 @@ static int kthread(void *_create)
                __kthread_parkme(&self);
                ret = threadfn(data);
        }
+
        /* we can't just return, we must preserve "self" on stack */
        do_exit(ret);
 }
@@ -332,6 +333,7 @@ static void __kthread_bind(struct task_struct *p, unsigned int cpu, long state)
                WARN_ON(1);
                return;
        }
+
        /* It's safe because the task is inactive. */
        do_set_cpus_allowed(p, cpumask_of(cpu));
        p->flags |= PF_NO_SETAFFINITY;