2.6.26-rc1

 kernel

diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index 6f4e0e1..0101aee 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -11,7 +11,6 @@
 #include <linux/interrupt.h>
 
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 /* Since we effect priority and affinity (both of which are visible
@@ -35,7 +34,7 @@ static int stopmachine(void *cpu)
    int irqs_disabled = 0;
    int prepared = 0;
 
-   set_cpus_allowed(current, cpumask_of_cpu((int)(long)cpu));
+   set_cpus_allowed_ptr(current, &cpumask_of_cpu((int)(long)cpu));
 
    /* Ack: we are alive */
    smp_mb(); /* Theoretically the ack = 0 might not be on this CPU yet. */
@@ -135,8 +134,7 @@ static void restart_machine(void)
    preempt_enable_no_resched();
 }
 
-struct stop_machine_data
-{
+struct stop_machine_data {
    int (*fn)(void *);
    void *data;
    struct completion done;