1 files changed, 5 insertions, 1 deletions

diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index f89014a2c238..1ff523dae6e2 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -270,7 +270,11 @@ unlock:
                 goto retry;
         }
 
-        wake_up_q(&wakeq);
+        if (!err) {
+                preempt_disable();
+                wake_up_q(&wakeq);
+                preempt_enable();
+        }
 
         return err;
 }