Merge branch 'for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[cascardo/linux.git] / kernel / sched / core.c

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index ea8f49a..4ee3ce7 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3174,7 +3174,7 @@ static void __sched notrace __schedule(bool preempt)
                        if (prev->flags & PF_WQ_WORKER) {
                                struct task_struct *to_wakeup;
 
-                               to_wakeup = wq_worker_sleeping(prev, cpu);
+                               to_wakeup = wq_worker_sleeping(prev);
                                if (to_wakeup)
                                        try_to_wake_up_local(to_wakeup);
                        }
@@ -8441,7 +8441,7 @@ struct cgroup_subsys cpu_cgrp_subsys = {
        .can_attach     = cpu_cgroup_can_attach,
        .attach         = cpu_cgroup_attach,
        .legacy_cftypes = cpu_files,
-       .early_init     = 1,
+       .early_init     = true,
 };
 
 #endif /* CONFIG_CGROUP_SCHED */