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

[net-next-2.6.git] / arch / x86 / kernel / smpboot.c

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 4d90f376e985fef9f4b0a6b7dac19c60d1e02125..51620953b18ac53967d47bb28b555ecacf906aeb 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -816,6 +816,13 @@ do_rest:
                        if (cpumask_test_cpu(cpu, cpu_callin_mask))
                                break;  /* It has booted */
                        udelay(100);
+                       /*
+                        * Allow other tasks to run while we wait for the
+                        * AP to come online. This also gives a chance
+                        * for the MTRR work(triggered by the AP coming online)
+                        * to be completed in the stop machine context.
+                        */
+                       schedule();
                }
 
                if (cpumask_test_cpu(cpu, cpu_callin_mask))