2 files changed, 6 insertions, 1 deletions

diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index d6fde98b74b3..83638aa096d5 100644
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -28,6 +28,7 @@
 #include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/slab.h>
+#include <linux/rcupdate.h>
 
 #include <asm/reg.h>
 #include <asm/uaccess.h>
@@ -54,9 +55,12 @@ cpu_idle(void)
                 /* FIXME -- EV6 and LCA45 know how to power down
                    the CPU.  */
 
+                rcu_idle_enter();
                 while (!need_resched())
                         cpu_relax();
-                schedule();
+
+                rcu_idle_exit();
+                schedule_preempt_disabled();
         }
 }
 
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 35ddc02bfa4a..a41ad90a97a6 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -166,6 +166,7 @@ smp_callin(void)
         DBGS(("smp_callin: commencing CPU %d current %p active_mm %p\n",
               cpuid, current, current->active_mm));
 
+        preempt_disable();
         /* Do nothing.  */
         cpu_idle();
 }