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

# Conflicts:
# arch/x86/Kconfig.debug
# kernel/sched/Makefile

19 files changed:
1  2 
.gitignore
Makefile
arch/x86/Kconfig.debug
include/linux/sched.h
init/main.c
kernel/Makefile
kernel/cpu.c
kernel/sched/cfs/Makefile
kernel/sched/cfs/auto_group.c
kernel/sched/cfs/core.c
kernel/sched/cfs/cpupri.c
kernel/sched/cfs/cputime.c
kernel/sched/cfs/debug.c
kernel/sched/cfs/fair.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 .gitignore
Simple merge
diff --cc Makefile
Simple merge
@@@ -304,6 -293,14 +293,16 @@@ config DEBUG_NMI_SELFTES
  
          If unsure, say N.
  
+ config X86_DEBUG_STATIC_CPU_HAS
+       bool "Debug alternatives"
+       depends on DEBUG_KERNEL
+       ---help---
+         This option causes additional code to be generated which
+         fails if static_cpu_has() is used before alternatives have
+         run.
+         If unsure, say N.
 +source "kernel/sched/modsched/Kconfig.debug"
 +
  endmenu
Simple merge
diff --cc init/main.c
Simple merge
diff --cc kernel/Makefile
@@@ -23,8 -23,8 +23,9 @@@ CFLAGS_REMOVE_irq_work.o = -p
  endif
  
  obj-y += sched/
 +
  obj-y += power/
+ obj-y += printk/
  obj-y += cpu/
  
  obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
diff --cc kernel/cpu.c
Simple merge
index f06d249,0000000..807f912
mode 100644,000000..100644
--- /dev/null
@@@ -1,18 -1,0 +1,18 @@@
- obj-y += core.o clock.o cputime.o idle_task.o fair.o rt.o stop_task.o
 +ifdef CONFIG_FUNCTION_TRACER
 +CFLAGS_REMOVE_clock.o = -pg
 +endif
 +
 +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-$(CONFIG_SMP) += cpupri.o
 +obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o
 +obj-$(CONFIG_SCHEDSTATS) += stats.o
 +obj-$(CONFIG_SCHED_DEBUG) += debug.o
Simple merge
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