From: Alexander Nyberg Fix some smp_processor_id-in-preemptible warnings Signed-off-by: Andrew Morton --- 25-akpm/kernel/power/smp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN kernel/power/smp.c~swsusp-smp-fix kernel/power/smp.c --- 25/kernel/power/smp.c~swsusp-smp-fix 2005-04-10 15:33:48.000000000 -0700 +++ 25-akpm/kernel/power/smp.c 2005-04-10 15:33:48.000000000 -0700 @@ -46,13 +46,13 @@ 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? */ _