aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power/smp.c
diff options
context:
space:
mode:
authorAlexander Nyberg <alexn@dsv.su.se>2005-04-16 18:25:39 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 18:25:39 -0400
commit43117a08280e40be43e181c51cce296ef4b4c7e5 (patch)
tree88b50248e7a9b690c44fd7ab5e7b3989534bc552 /kernel/power/smp.c
parentbf2049f983eb47f9463d3dd54abd82e3e58846f9 (diff)
[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>
Diffstat (limited to 'kernel/power/smp.c')
-rw-r--r--kernel/power/smp.c4
1 files changed, 2 insertions, 2 deletions
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;
46 46
47void disable_nonboot_cpus(void) 47void disable_nonboot_cpus(void)
48{ 48{
49 printk("Freezing CPUs (at %d)", smp_processor_id());
50 oldmask = current->cpus_allowed; 49 oldmask = current->cpus_allowed;
51 set_cpus_allowed(current, cpumask_of_cpu(0)); 50 set_cpus_allowed(current, cpumask_of_cpu(0));
51 printk("Freezing CPUs (at %d)", _smp_processor_id());
52 current->state = TASK_INTERRUPTIBLE; 52 current->state = TASK_INTERRUPTIBLE;
53 schedule_timeout(HZ); 53 schedule_timeout(HZ);
54 printk("..."); 54 printk("...");
55 BUG_ON(smp_processor_id() != 0); 55 BUG_ON(_smp_processor_id() != 0);
56 56
57 /* FIXME: for this to work, all the CPUs must be running 57 /* FIXME: for this to work, all the CPUs must be running
58 * "idle" thread (or we deadlock). Is that guaranteed? */ 58 * "idle" thread (or we deadlock). Is that guaranteed? */