From: Ingo Molnar Date: Tue, 20 Jun 2017 10:28:21 +0000 (+0200) Subject: Merge branch 'WIP.sched/core' into sched/core X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=902b31941327a0e9c0ca9eb7750414ae41bf8a89;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'WIP.sched/core' into sched/core Conflicts: kernel/sched/Makefile Pick up the waitqueue related renames - it didn't get much feedback, so it appears to be uncontroversial. Famous last words? ;-) Signed-off-by: Ingo Molnar --- 902b31941327a0e9c0ca9eb7750414ae41bf8a89 diff --cc kernel/sched/Makefile index 5e4c2e7a632b,16277e2ed8ee..53f0164ed362 --- a/kernel/sched/Makefile +++ b/kernel/sched/Makefile @@@ -16,9 -16,9 +16,9 @@@ CFLAGS_core.o := $(PROFILING) -fno-omit endif obj-y += core.o loadavg.o clock.o cputime.o -obj-y += idle_task.o fair.o rt.o deadline.o stop_task.o +obj-y += idle_task.o fair.o rt.o deadline.o - obj-y += wait.o swait.o completion.o idle.o + obj-y += wait.o wait_bit.o swait.o completion.o idle.o -obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o topology.o +obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o topology.o stop_task.o obj-$(CONFIG_SCHED_AUTOGROUP) += autogroup.o obj-$(CONFIG_SCHEDSTATS) += stats.o obj-$(CONFIG_SCHED_DEBUG) += debug.o