浏览代码

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>
Avi Kivity 18 年之前
父节点
当前提交
ac076758b9
共有 1 个文件被更改,包括 3 次插入0 次删除
  1. 3 0
      kernel/cpuset.c

+ 3 - 0
kernel/cpuset.c

@@ -2138,6 +2138,9 @@ static void common_cpu_mem_hotplug_unplug(void)
 static int cpuset_handle_cpuhp(struct notifier_block *nb,
 static int cpuset_handle_cpuhp(struct notifier_block *nb,
 				unsigned long phase, void *cpu)
 				unsigned long phase, void *cpu)
 {
 {
+	if (phase == CPU_DYING || phase == CPU_DYING_FROZEN)
+		return NOTIFY_DONE;
+
 	common_cpu_mem_hotplug_unplug();
 	common_cpu_mem_hotplug_unplug();
 	return 0;
 	return 0;
 }
 }