diff options
| author | Alexander Nyberg <alexn@dsv.su.se> | 2005-04-16 15:25:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:39 -0700 |
| commit | 43117a08280e40be43e181c51cce296ef4b4c7e5 (patch) | |
| tree | 88b50248e7a9b690c44fd7ab5e7b3989534bc552 /kernel/power | |
| parent | bf2049f983eb47f9463d3dd54abd82e3e58846f9 (diff) | |
| download | blackbird-op-linux-43117a08280e40be43e181c51cce296ef4b4c7e5.tar.gz blackbird-op-linux-43117a08280e40be43e181c51cce296ef4b4c7e5.zip | |
[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')
| -rw-r--r-- | kernel/power/smp.c | 4 |
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; 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? */ |
