Merge tag 'v3.13' into p/abusse/merge_upgrade
authorAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 14:26:47 +0000 (15:26 +0100)
committerAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 14:26:47 +0000 (15:26 +0100)
Linux 3.13

# Conflicts:
# kernel/Makefile
# kernel/sched/Makefile

18 files changed:
1  2 
Makefile
arch/x86/Kconfig.debug
arch/x86/kernel/vmlinux.lds.S
include/linux/sched.h
init/main.c
kernel/cpu.c
kernel/kthread.c
kernel/sched/Makefile
kernel/sched/cfs/core.c
kernel/sched/cfs/debug.c
kernel/sched/cfs/fair.c
kernel/sched/cfs/features.h
kernel/sched/cfs/idle_task.c
kernel/sched/cfs/rt.c
kernel/sched/cfs/sched.h
kernel/sched/cfs/stats.h
kernel/sched/cfs/stop_task.c
kernel/sysctl.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
diff --cc kernel/cpu.c
Simple merge
Simple merge
@@@ -1,6 -1,20 +1,7 @@@
 -ifdef CONFIG_FUNCTION_TRACER
 -CFLAGS_REMOVE_clock.o = -pg
 -endif
 +KBUILD_CFLAGS += -Ikernel/sched/
  
 -ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
 -# According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is
 -# needed for x86 only.  Why this used to be enabled for all architectures is beyond
 -# me.  I suspect most platforms don't need this, but until we know that for sure
 -# I turn this off for IA-64 only.  Andreas Schwab says it's also needed on m68k
 -# to get a correct value for the wait-channel (WCHAN in ps). --davidm
 -CFLAGS_core.o := $(PROFILING) -fno-omit-frame-pointer
 -endif
 -
 -obj-y += core.o proc.o clock.o cputime.o idle_task.o fair.o rt.o stop_task.o
+ obj-y += wait.o completion.o
 -obj-$(CONFIG_SMP) += cpupri.o
 -obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o
 -obj-$(CONFIG_SCHEDSTATS) += stats.o
  obj-$(CONFIG_SCHED_DEBUG) += debug.o
  obj-$(CONFIG_CGROUP_CPUACCT) += cpuacct.o
 +obj-$(CONFIG_CFS_SCHED) += cfs/
 +obj-$(CONFIG_MOD_SCHED) += modsched/
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sysctl.c
Simple merge