From: Avi Kivity <avi@qumranet.com>
Date: Thu, 24 May 2007 09:33:15 +0000 (+0300)
Subject: HOTPLUG: Adapt cpuset hotplug callback to CPU_DYING
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ac076758b97d9e3d2c1557cfa412911e93cd0919;p=deliverable%2Flinux.git

HOTPLUG: Adapt cpuset hotplug callback to CPU_DYING

CPU_DYING is called in atomic context, so don't try to take any locks.

Signed-off-by: Avi Kivity <avi@qumranet.com>
---

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 4c49188cc49b..c4d123f74bd3 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -2138,6 +2138,9 @@ static void common_cpu_mem_hotplug_unplug(void)
 static int cpuset_handle_cpuhp(struct notifier_block *nb,
 				unsigned long phase, void *cpu)
 {
+	if (phase == CPU_DYING || phase == CPU_DYING_FROZEN)
+		return NOTIFY_DONE;
+
 	common_cpu_mem_hotplug_unplug();
 	return 0;
 }