1 files changed, 4 insertions, 1 deletions

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 63aa50d7ce1e..2227b58734a7 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -306,7 +306,6 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
                                 __func__, cpu);
                 goto out_release;
         }
-        smpboot_park_threads(cpu);
 
         /*
          * By now we've cleared cpu_active_mask, wait for all preempt-disabled
@@ -315,12 +314,16 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
          *
          * For CONFIG_PREEMPT we have preemptible RCU and its sync_rcu() might
          * not imply sync_sched(), so explicitly call both.
+         *
+         * Do sync before park smpboot threads to take care the rcu boost case.
          */
 #ifdef CONFIG_PREEMPT
         synchronize_sched();
 #endif
         synchronize_rcu();
 
+        smpboot_park_threads(cpu);
+
         /*
          * So now all preempt/rcu users must observe !cpu_active().
          */