Merge branch 'master'

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index 11b1b90ba6ba..13d109328a42 100644
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -102,7 +102,9 @@ void cpu_idle(void)
         while (1) {
                 while (!need_resched())
                         idle();
+                preempt_enable_no_resched();
                 schedule();
+                preempt_disable();
         }
 }