From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Aug 2018 18:25:07 +0000 (-0700)
Subject: Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: microblaze-v5.0-rc1~684
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=f7951c33f0fed14ee26651a70a46899a59a31e18;p=linux-2.6-microblaze.git

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

Pull scheduler updates from Thomas Gleixner:

 - Cleanup and improvement of NUMA balancing

 - Refactoring and improvements to the PELT (Per Entity Load Tracking)
   code

 - Watchdog simplification and related cleanups

 - The usual pile of small incremental fixes and improvements

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (41 commits)
  watchdog: Reduce message verbosity
  stop_machine: Reflow cpu_stop_queue_two_works()
  sched/numa: Move task_numa_placement() closer to numa_migrate_preferred()
  sched/numa: Use group_weights to identify if migration degrades locality
  sched/numa: Update the scan period without holding the numa_group lock
  sched/numa: Remove numa_has_capacity()
  sched/numa: Modify migrate_swap() to accept additional parameters
  sched/numa: Remove unused task_capacity from 'struct numa_stats'
  sched/numa: Skip nodes that are at 'hoplimit'
  sched/debug: Reverse the order of printing faults
  sched/numa: Use task faults only if numa_group is not yet set up
  sched/numa: Set preferred_node based on best_cpu
  sched/numa: Simplify load_too_imbalanced()
  sched/numa: Evaluate move once per node
  sched/numa: Remove redundant field
  sched/debug: Show the sum wait time of a task group
  sched/fair: Remove #ifdefs from scale_rt_capacity()
  sched/core: Remove get_cpu() from sched_fork()
  sched/cpufreq: Clarify sugov_get_util()
  sched/sysctl: Remove unused sched_time_avg_ms sysctl
  ...
---

f7951c33f0fed14ee26651a70a46899a59a31e18
diff --cc kernel/rcu/tree.c
index 6930934e8b9f,91f888d3b23a..0b760c1369f7
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@@ -2160,10 -2141,10 +2160,10 @@@ static int __noreturn rcu_gp_kthread(vo
  		/* Handle grace-period start. */
  		for (;;) {
  			trace_rcu_grace_period(rsp->name,
 -					       READ_ONCE(rsp->gpnum),
 +					       READ_ONCE(rsp->gp_seq),
  					       TPS("reqwait"));
  			rsp->gp_state = RCU_GP_WAIT_GPS;
- 			swait_event_idle(rsp->gp_wq, READ_ONCE(rsp->gp_flags) &
+ 			swait_event_idle_exclusive(rsp->gp_wq, READ_ONCE(rsp->gp_flags) &
  						     RCU_GP_FLAG_INIT);
  			rsp->gp_state = RCU_GP_DONE_GPS;
  			/* Locking provides needed memory barrier. */
@@@ -2188,10 -2173,10 +2188,10 @@@
  					   jiffies + 3 * j);
  			}
  			trace_rcu_grace_period(rsp->name,
 -					       READ_ONCE(rsp->gpnum),
 +					       READ_ONCE(rsp->gp_seq),
  					       TPS("fqswait"));
  			rsp->gp_state = RCU_GP_WAIT_FQS;
- 			ret = swait_event_idle_timeout(rsp->gp_wq,
+ 			ret = swait_event_idle_timeout_exclusive(rsp->gp_wq,
  					rcu_gp_fqs_check_wake(rsp, &gf), j);
  			rsp->gp_state = RCU_GP_DOING_FQS;
  			/* Locking provides needed memory barriers. */
diff --cc kernel/rcu/tree_plugin.h
index c1b17f5b9361,ad53d133f709..a97c20ea9bce
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@@ -2159,9 -2082,9 +2159,9 @@@ static void rcu_nocb_wait_gp(struct rcu
  	 */
  	trace_rcu_this_gp(rnp, rdp, c, TPS("StartWait"));
  	for (;;) {
- 		swait_event_interruptible(
+ 		swait_event_interruptible_exclusive(
 -			rnp->nocb_gp_wq[c & 0x1],
 -			(d = ULONG_CMP_GE(READ_ONCE(rnp->completed), c)));
 +			rnp->nocb_gp_wq[rcu_seq_ctr(c) & 0x1],
 +			(d = rcu_seq_done(&rnp->gp_seq, c)));
  		if (likely(d))
  			break;
  		WARN_ON(signal_pending(current));