[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1231342755-5122-1-git-send-email-jirislaby@gmail.com>
Date: Wed, 7 Jan 2009 16:39:15 +0100
From: Jiri Slaby <jirislaby@...il.com>
To: Rusty Russell <rusty@...tcorp.com.au>
Cc: linux-kernel@...r.kernel.org, Jiri Slaby <jirislaby@...il.com>,
Heiko Carstens <heiko.carstens@...ibm.com>,
Rusty Russell <rusty@...tcorp.com.au>
Subject: [PATCH 1/1] cpu: create stop machine in disable_nonboot_cpus
Commit
772cd49cfa4002439b16dd6b553a11771ac096fd
(stop_machine: introduce stop_machine_create/destroy.)
introduced stop_machine_create/destroy, but omitted to call them from
disable_nonboot_cpus (it's called only from cpu_down).
Create and destroy the stop machine even in disable_nonboot_cpus
(which calls _cpu_down too) to avoid NULL-pointer dereference oops on
suspend.
Signed-off-by: Jiri Slaby <jirislaby@...il.com>
Cc: Heiko Carstens <heiko.carstens@...ibm.com>
Cc: Rusty Russell <rusty@...tcorp.com.au>
---
kernel/cpu.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 30e74dd..79e40f0 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -379,8 +379,11 @@ static cpumask_var_t frozen_cpus;
int disable_nonboot_cpus(void)
{
- int cpu, first_cpu, error = 0;
+ int cpu, first_cpu, error;
+ error = stop_machine_create();
+ if (error)
+ return error;
cpu_maps_update_begin();
first_cpu = cpumask_first(cpu_online_mask);
/* We take down all of the non-boot CPUs in one shot to avoid races
@@ -409,6 +412,7 @@ int disable_nonboot_cpus(void)
printk(KERN_ERR "Non-boot CPUs are not disabled\n");
}
cpu_maps_update_done();
+ stop_machine_destroy();
return error;
}
--
1.6.0.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists