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

[karo-tx-linux.git] / kernel / sched / core.c

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 5186797908dc261eb4132271b2ced312708a12c9..17c667b427b4a570611272f2906a8bf50778a7ce 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5608,15 +5608,9 @@ int sched_cpu_deactivate(unsigned int cpu)
         * users of this state to go away such that all new such users will
         * observe it.
         *
-        * For CONFIG_PREEMPT we have preemptible RCU and its sync_rcu() might
-        * not imply sync_sched(), so wait for both.
-        *
         * Do sync before park smpboot threads to take care the rcu boost case.
         */
-       if (IS_ENABLED(CONFIG_PREEMPT))
-               synchronize_rcu_mult(call_rcu, call_rcu_sched);
-       else
-               synchronize_rcu();
+       synchronize_rcu_mult(call_rcu, call_rcu_sched);
 
        if (!sched_smp_initialized)
                return 0;