浏览代码

[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>
Alexander Nyberg 20 年之前
父节点
当前提交
43117a0828
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      kernel/power/smp.c

+ 2 - 2
kernel/power/smp.c

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