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

17 files changed:
1  2 
Makefile
include/asm-generic/vmlinux.lds.h
include/linux/sched.h
init/main.c
kernel/cpu.c
kernel/kthread.c
kernel/sched/cfs/auto_group.c
kernel/sched/cfs/core.c
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/stop_task.c
kernel/sched/idle.c
kernel/sysctl.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
diff --cc kernel/cpu.c
Simple merge
Simple merge
Simple merge
@@@ -1776,11 -1789,23 +1793,25 @@@ EXPORT_SYMBOL(wake_up_process)
  
  int wake_up_state(struct task_struct *p, unsigned int state)
  {
 +      WARN_ON(task_is_stopped_or_traced(p));
        return try_to_wake_up(p, state, 0);
  }
 +EXPORT_SYMBOL(wake_up_process);
  
+ /*
+  * This function clears the sched_dl_entity static params.
+  */
+ void __dl_clear_params(struct task_struct *p)
+ {
+       struct sched_dl_entity *dl_se = &p->dl;
+       dl_se->dl_runtime = 0;
+       dl_se->dl_deadline = 0;
+       dl_se->dl_period = 0;
+       dl_se->flags = 0;
+       dl_se->dl_bw = 0;
+ }
  /*
   * Perform scheduler related setup for a newly forked process p.
   * p is forked by current.
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sysctl.c
Simple merge