[patch 122/198] swsusp: SMP fix
From: akpm
Date: Tue Apr 12 2005 - 23:25:20 EST
From: Alexander Nyberg <alexn@xxxxxxxxx>
Fix some smp_processor_id-in-preemptible warnings
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
25-akpm/kernel/power/smp.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff -puN kernel/power/smp.c~swsusp-smp-fix kernel/power/smp.c
--- 25/kernel/power/smp.c~swsusp-smp-fix 2005-04-12 03:21:32.984122552 -0700
+++ 25-akpm/kernel/power/smp.c 2005-04-12 03:21:32.987122096 -0700
@@ -46,13 +46,13 @@ static cpumask_t oldmask;
void disable_nonboot_cpus(void)
{
- printk("Freezing CPUs (at %d)", smp_processor_id());
oldmask = current->cpus_allowed;
set_cpus_allowed(current, cpumask_of_cpu(0));
+ printk("Freezing CPUs (at %d)", _smp_processor_id());
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(HZ);
printk("...");
- BUG_ON(smp_processor_id() != 0);
+ BUG_ON(_smp_processor_id() != 0);
/* FIXME: for this to work, all the CPUs must be running
* "idle" thread (or we deadlock). Is that guaranteed? */
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/