tree 155ddbc90f10313c0c20e74420b699bd8ec7e3f7
parent b6608952865f0d8de5d0070e6f0d19253b28260d
author Alexander Nyberg <[EMAIL PROTECTED]> Tue Apr 12 08:26:07 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:26:07 2005
[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]>
smp.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: kernel/power/smp.c
===================================================================
--- 6a9effe045457b81a92d75dd57ca6887cb80b536/kernel/power/smp.c (mode:100644
sha1:f58fee4ea9306e464ad258b6ce99d4fd3bbaa4ba)
+++ 155ddbc90f10313c0c20e74420b699bd8ec7e3f7/kernel/power/smp.c (mode:100644
sha1:6bc3c8d144c9cb0f0e62b0fa1456d4d67e07d82d)
@@ -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
