Merge tag 'v3.10' into p/abusse/tmp_310
authorAnselm Busse <mail@anselm-busse.de>
Mon, 18 Jan 2016 13:02:06 +0000 (14:02 +0100)
committerAnselm Busse <mail@anselm-busse.de>
Mon, 18 Jan 2016 13:02:06 +0000 (14:02 +0100)
Linux 3.10

# Conflicts:
# arch/x86/kernel/process.c
# include/linux/sched.h
# kernel/sched/Makefile
# kernel/workqueue.c

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

diff --cc Makefile
Simple merge
Simple merge
Simple merge
@@@ -1582,9 -1412,10 +1417,13 @@@ struct task_struct 
  #ifdef CONFIG_UPROBES
        struct uprobe_task *utask;
  #endif
+ #if defined(CONFIG_BCACHE) || defined(CONFIG_BCACHE_MODULE)
+       unsigned int    sequential_io;
+       unsigned int    sequential_io_avg;
+ #endif
 +#ifdef CONFIG_MOD_SCHED
 +      struct fw_task fw_task;
 +#endif
  };
  
  /* Future-safe accessor for struct task_struct's cpus_allowed. */
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 += cpu/
  
  obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
  obj-$(CONFIG_FREEZER) += freezer.o
diff --cc kernel/cpu.c
Simple merge
@@@ -264,10 -295,9 +296,10 @@@ static void __kthread_bind(struct task_
                WARN_ON(1);
                return;
        }
 +
        /* It's safe because the task is inactive. */
        do_set_cpus_allowed(p, cpumask_of(cpu));
-       p->flags |= PF_THREAD_BOUND;
+       p->flags |= PF_NO_SETAFFINITY;
  }
  
  /**
@@@ -1,4 -1,19 +1,6 @@@
 -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 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
+ 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
diff --cc kernel/sysctl.c
Simple merge