From: Alexander Nyberg <alexn@dsv.su.se>
Date: Sat, 16 Apr 2005 22:25:39 +0000 (-0700)
Subject: [PATCH] swsusp: SMP fix
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=43117a08280e40be43e181c51cce296ef4b4c7e5;p=openwrt%2Fstaging%2Fblogic.git

[PATCH] swsusp: SMP fix

Fix some smp_processor_id-in-preemptible warnings

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

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? */