From 43117a08280e40be43e181c51cce296ef4b4c7e5 Mon Sep 17 00:00:00 2001 From: Alexander Nyberg Date: Sat, 16 Apr 2005 15:25:39 -0700 Subject: [PATCH] [PATCH] swsusp: SMP fix Fix some smp_processor_id-in-preemptible warnings Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- kernel/power/smp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/power/smp.c b/kernel/power/smp.c index 7fa7f6e2b7fb..cba3584b80fe 100644 --- a/kernel/power/smp.c +++ b/kernel/power/smp.c @@ -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? */