Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull scheduler changes from Ingo Molnar:
 "Various optimizations, cleanups and smaller fixes - no major changes
  in scheduler behavior"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/fair: Fix the sd_parent_degenerate() code
  sched/fair: Rework and comment the group_imb code
  sched/fair: Optimize find_busiest_queue()
  sched/fair: Make group power more consistent
  sched/fair: Remove duplicate load_per_task computations
  sched/fair: Shrink sg_lb_stats and play memset games
  sched: Clean-up struct sd_lb_stat
  sched: Factor out code to should_we_balance()
  sched: Remove one division operation in find_busiest_queue()
  sched/cputime: Use this_cpu_add() in task_group_account_field()
  cpumask: Fix cpumask leak in partition_sched_domains()
  sched/x86: Optimize switch_mm() for multi-threaded workloads
  generic-ipi: Kill unnecessary variable - csd_flags
  numa: Mark __node_set() as __always_inline
  sched/fair: Cleanup: remove duplicate variable declaration
  sched/__wake_up_sync_key(): Fix nr_exclusive tasks which lead to WF_SYNC clearing

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/fair.c
index 8977a249816fcf5b69770e1ca2a54d4b5378e595,dffb27070ddb3d66a8d22f16046c0f434ccf0086..7f0a5e6cdae0e03db16a8c8fec5bd48ba1f893af
--- 1/kernel/sched/fair.c
--- 2/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@@ -4916,10 -4903,8 +4953,8 @@@ static inline void calculate_imbalance(
   * to restore balance.
   *
   * @env: The load balancing environment.
-  * @balance: Pointer to a variable indicating if this_cpu
-  *    is the appropriate cpu to perform load balancing at this_level.
   *
 - * Returns:   - the busiest group if imbalance exists.
 + * Return:    - The busiest group if imbalance exists.
   *            - If no imbalance and user has opted for power-savings balance,
   *               return the least loaded group whose CPUs can be
   *               put to idle by rebalancing its tasks onto our group.

diff --cc kernel/smp.c
Simple merge