From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Jun 2014 21:00:15 +0000 (-0700)
Subject: Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.16-rc1~30^2~23
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c84a1e32ee58fc1cc9d3fd42619b917cce67e30a;p=~emulex%2Finfiniband.git

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

Pull scheduler updates from Ingo Molnar:
 "The main scheduling related changes in this cycle were:

   - various sched/numa updates, for better performance

   - tree wide cleanup of open coded nice levels

   - nohz fix related to rq->nr_running use

   - cpuidle changes and continued consolidation to improve the
     kernel/sched/idle.c high level idle scheduling logic.  As part of
     this effort I pulled cpuidle driver changes from Rafael as well.

   - standardized idle polling amongst architectures

   - continued work on preparing better power/energy aware scheduling

   - sched/rt updates

   - misc fixlets and cleanups"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (49 commits)
  sched/numa: Decay ->wakee_flips instead of zeroing
  sched/numa: Update migrate_improves/degrades_locality()
  sched/numa: Allow task switch if load imbalance improves
  sched/rt: Fix 'struct sched_dl_entity' and dl_task_time() comments, to match the current upstream code
  sched: Consolidate open coded implementations of nice level frobbing into nice_to_rlimit() and rlimit_to_nice()
  sched: Initialize rq->age_stamp on processor start
  sched, nohz: Change rq->nr_running to always use wrappers
  sched: Fix the rq->next_balance logic in rebalance_domains() and idle_balance()
  sched: Use clamp() and clamp_val() to make sys_nice() more readable
  sched: Do not zero sg->cpumask and sg->sgp->power in build_sched_groups()
  sched/numa: Fix initialization of sched_domain_topology for NUMA
  sched: Call select_idle_sibling() when not affine_sd
  sched: Simplify return logic in sched_read_attr()
  sched: Simplify return logic in sched_copy_attr()
  sched: Fix exec_start/task_hot on migrated tasks
  arm64: Remove TIF_POLLING_NRFLAG
  metag: Remove TIF_POLLING_NRFLAG
  sched/idle: Make cpuidle_idle_call() void
  sched/idle: Reflow cpuidle_idle_call()
  sched/idle: Delay clearing the polling bit
  ...
---

c84a1e32ee58fc1cc9d3fd42619b917cce67e30a
diff --cc kernel/locking/locktorture.c
index dbafeac18e4,23343be46e9..0955b885d0d
--- a/kernel/locking/locktorture.c
+++ b/kernel/locking/locktorture.c
@@@ -216,11 -216,10 +216,11 @@@ static int lock_torture_writer(void *ar
  	static DEFINE_TORTURE_RANDOM(rand);
  
  	VERBOSE_TOROUT_STRING("lock_torture_writer task started");
- 	set_user_nice(current, 19);
+ 	set_user_nice(current, MAX_NICE);
  
  	do {
 -		schedule_timeout_uninterruptible(1);
 +		if ((torture_random(&rand) & 0xfffff) == 0)
 +			schedule_timeout_uninterruptible(1);
  		cur_ops->writelock();
  		if (WARN_ON_ONCE(lock_is_write_held))
  			lwsp->n_write_lock_fail++;