From: Nigel Cunningham <ncunningham@cyclades.com>
Date: Wed, 27 Jul 2005 18:43:41 +0000 (-0700)
Subject: [PATCH] Address BUG: using smp_processor_id() in preemptible [00000001] code
X-Git-Tag: v2.6.13-rc4~25^2~150
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bba0e4670a4e1841a96b561dcc60ebe335049891;p=linux-2.6-omap-h63xx.git

[PATCH] Address BUG: using smp_processor_id() in preemptible [00000001] code

This patch fixes a warning in the disable_nonboot_cpus call in
kernel/power/smp.c.

Signed-off by: Nigel Cunningham <nigel@suspend2.net>

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 bbe23079c62..911fc62b822 100644
--- a/kernel/power/smp.c
+++ b/kernel/power/smp.c
@@ -38,7 +38,7 @@ void disable_nonboot_cpus(void)
 		}
 		printk("Error taking cpu %d down: %d\n", cpu, error);
 	}
-	BUG_ON(smp_processor_id() != 0);
+	BUG_ON(raw_smp_processor_id() != 0);
 	if (error)
 		panic("cpus not sleeping");
 }