[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 bbe23079c62c46e306e95e2215623659e39d565b..911fc62b822546d0e1b05dddb0c2d8bdc771c056 100644 (file)
--- 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");
 }