Commit 43117a08 authored by Alexander Nyberg's avatar Alexander Nyberg Committed by Linus Torvalds

[PATCH] swsusp: SMP fix

Fix some smp_processor_id-in-preemptible warnings
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bf2049f9
...@@ -46,13 +46,13 @@ static cpumask_t oldmask; ...@@ -46,13 +46,13 @@ static cpumask_t oldmask;
void disable_nonboot_cpus(void) void disable_nonboot_cpus(void)
{ {
printk("Freezing CPUs (at %d)", smp_processor_id());
oldmask = current->cpus_allowed; oldmask = current->cpus_allowed;
set_cpus_allowed(current, cpumask_of_cpu(0)); set_cpus_allowed(current, cpumask_of_cpu(0));
printk("Freezing CPUs (at %d)", _smp_processor_id());
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
schedule_timeout(HZ); schedule_timeout(HZ);
printk("..."); printk("...");
BUG_ON(smp_processor_id() != 0); BUG_ON(_smp_processor_id() != 0);
/* FIXME: for this to work, all the CPUs must be running /* FIXME: for this to work, all the CPUs must be running
* "idle" thread (or we deadlock). Is that guaranteed? */ * "idle" thread (or we deadlock). Is that guaranteed? */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment