vserver 2.0 rc7

[linux-2.6.git] / kernel / power / smp.c

diff --git a/kernel/power/smp.c b/kernel/power/smp.c
index cda77cd..cba3584 100644 (file)
--- a/kernel/power/smp.c
+++ b/kernel/power/smp.c
@@ -42,17 +42,17 @@ static void smp_pause(void * data)
        __restore_processor_state(&ctxt);
 }
 
-cpumask_t oldmask;
+static cpumask_t oldmask;
 
 void disable_nonboot_cpus(void)
 {
-       printk("Freezing CPUs (at %d)", smp_processor_id());
        oldmask = current->cpus_allowed;
        set_cpus_allowed(current, cpumask_of_cpu(0));
+       printk("Freezing CPUs (at %d)", _smp_processor_id());
        current->state = TASK_INTERRUPTIBLE;
        schedule_timeout(HZ);
        printk("...");
-       BUG_ON(smp_processor_id() != 0);
+       BUG_ON(_smp_processor_id() != 0);
 
        /* FIXME: for this to work, all the CPUs must be running
         * "idle" thread (or we deadlock). Is that guaranteed? */