]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...
authorIngo Molnar <mingo@kernel.org>
Tue, 4 Dec 2018 06:52:30 +0000 (07:52 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 4 Dec 2018 06:52:30 +0000 (07:52 +0100)
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>
1  2 
Documentation/admin-guide/kernel-parameters.txt
MAINTAINERS
arch/s390/mm/pgalloc.c
fs/userfaultfd.c
include/linux/sched.h
include/linux/tracepoint.h
kernel/sched/core.c
kernel/trace/ftrace.c
mm/khugepaged.c
net/core/netpoll.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 6fedf3a98581b34b388a014d9ddb671ab8281a1f,ea12ebc57840ae93b9f206e6a347529edc2dfecd..a5b7f1c9f24f1e6c8765221cab2757f1d59d3ddd
@@@ -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;
  
Simple merge
diff --cc mm/khugepaged.c
Simple merge
Simple merge