tree 88b50248e7a9b690c44fd7ab5e7b3989534bc552
parent bf2049f983eb47f9463d3dd54abd82e3e58846f9
author Alexander Nyberg <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:39 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:39 -0700
[PATCH] swsusp: SMP fix
Fix some smp_processor_id-in-preemptible warnings
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
power/smp.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: kernel/power/smp.c
===================================================================
--- 99b6f13374bd05c39710ead54bc7d7d6ed7c5f0c/kernel/power/smp.c (mode:100644
sha1:7fa7f6e2b7fb68be1b382ef8db73daf7d46a7933)
+++ 88b50248e7a9b690c44fd7ab5e7b3989534bc552/kernel/power/smp.c (mode:100644
sha1:cba3584b80fefa88b3fdcb8d938800b08d44abeb)
@@ -46,13 +46,13 @@
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 bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
