From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 4 Dec 2018 06:52:30 +0000 (+0100)
Subject: Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck... 
X-Git-Tag: v5.0-rc1~152^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4bbfd7467cfc7d42e18d3008fa6a28ffd56e901a;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu

Pull RCU changes from Paul E. McKenney:

- Convert RCU's BUG_ON() and similar calls to WARN_ON() and similar.

- Replace calls of RCU-bh and RCU-sched update-side functions
  to their vanilla RCU counterparts.  This series is a step
  towards complete removal of the RCU-bh and RCU-sched update-side
  functions.

  ( Note that some of these conversions are going upstream via their
    respective maintainers. )

- Documentation updates, including a number of flavor-consolidation
  updates from Joel Fernandes.

- Miscellaneous fixes.

- Automate generation of the initrd filesystem used for
  rcutorture testing.

- Convert spin_is_locked() assertions to instead use lockdep.

  ( Note that some of these conversions are going upstream via their
    respective maintainers. )

- SRCU updates, especially including a fix from Dennis Krein
  for a bag-on-head-class bug.

- RCU torture-test updates.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

4bbfd7467cfc7d42e18d3008fa6a28ffd56e901a
diff --cc kernel/sched/core.c
index 6fedf3a98581,ea12ebc57840..a5b7f1c9f24f
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@@ -5783,16 -5788,8 +5783,16 @@@ int sched_cpu_deactivate(unsigned int c
  	 *
  	 * Do sync before park smpboot threads to take care the rcu boost case.
  	 */
- 	synchronize_rcu_mult(call_rcu, call_rcu_sched);
+ 	synchronize_rcu();
  
 +#ifdef CONFIG_SCHED_SMT
 +	/*
 +	 * When going down, decrement the number of cores with SMT present.
 +	 */
 +	if (cpumask_weight(cpu_smt_mask(cpu)) == 2)
 +		static_branch_dec_cpuslocked(&sched_smt_present);
 +#endif
 +
  	if (!sched_smp_initialized)
  		return 0;