Merge tag 'v3.15' into p/abusse/merge_upgrade
authorAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 19:05:20 +0000 (20:05 +0100)
committerAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 19:05:20 +0000 (20:05 +0100)
Linux 3.15

# Conflicts:
# kernel/sched/Makefile

21 files changed:
1  2 
Makefile
arch/x86/Kconfig.debug
include/asm-generic/vmlinux.lds.h
include/linux/sched.h
init/main.c
kernel/cpu.c
kernel/kthread.c
kernel/sched/Makefile
kernel/sched/cfs/auto_group.c
kernel/sched/cfs/core.c
kernel/sched/cfs/cpupri.c
kernel/sched/cfs/cpupri.h
kernel/sched/cfs/cputime.c
kernel/sched/cfs/debug.c
kernel/sched/cfs/fair.c
kernel/sched/cfs/idle_task.c
kernel/sched/cfs/rt.c
kernel/sched/cfs/sched.h
kernel/sched/cfs/stats.c
kernel/sched/cfs/stop_task.c
kernel/sysctl.c

diff --cc Makefile
+++ b/Makefile
@@@ -380,8 -394,9 +394,8 @@@ KBUILD_CPPFLAGS := -D__KERNEL_
  
  KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
                   -fno-strict-aliasing -fno-common \
 -                 -Werror-implicit-function-declaration \
                   -Wno-format-security \
-                  -fno-delete-null-pointer-checks
+                  $(call cc-option,-fno-delete-null-pointer-checks,)
  KBUILD_AFLAGS_KERNEL :=
  KBUILD_CFLAGS_KERNEL :=
  KBUILD_AFLAGS   := -D__ASSEMBLY__
Simple merge
                *(.security_initcall.init)                              \
                VMLINUX_SYMBOL(__security_initcall_end) = .;
  
++#ifdef CONFIG_MOD_SCHED
++#define COBAS_INITCALL                                                        \
++              VMLINUX_SYMBOL(__fw_modules_init_start) = .;            \
++              *(.fw.modules.init)                                     \
++              VMLINUX_SYMBOL(__fw_modules_init_end) = .;
++#else
++#define COBAS_INITCALL
++#endif
++
  #ifdef CONFIG_BLK_DEV_INITRD
  #define INIT_RAM_FS                                                   \
        . = ALIGN(4);                                                   \
                INIT_CALLS                                              \
                CON_INITCALL                                            \
                SECURITY_INITCALL                                       \
++              COBAS_INITCALL                                  \
                INIT_RAM_FS                                             \
        }
  
Simple merge
diff --cc init/main.c
Simple merge
diff --cc kernel/cpu.c
  #include <linux/mutex.h>
  #include <linux/gfp.h>
  #include <linux/suspend.h>
+ #include <linux/lockdep.h>
  
 +#ifdef CONFIG_MOD_SCHED
 +    #include <fw_comm.h>
 +#endif
 +
  #include "smpboot.h"
  
  #ifdef CONFIG_SMP
Simple merge
@@@ -1,8 -1,21 +1,8 @@@
 -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
 -obj-y += idle_task.o fair.o rt.o deadline.o stop_task.o
 -obj-y += wait.o completion.o idle.o
 -obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o
 -obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o
 -obj-$(CONFIG_SCHEDSTATS) += stats.o
 +obj-y += clock.o
- obj-y += wait.o completion.o
++obj-y += wait.o idle.o completion.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
Simple merge
Simple merge
Simple merge
diff --cc kernel/sysctl.c
Simple merge