From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Sep 2013 15:36:35 +0000 (-0700)
Subject: Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5e0b3a4e88012d259e8b2c0f02f393c79686daf9;p=linux-beck.git

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

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
---

5e0b3a4e88012d259e8b2c0f02f393c79686daf9
diff --cc kernel/sched/fair.c
index 8977a249816f,dffb27070ddb..7f0a5e6cdae0
--- a/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.