diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 4c49188cc49b67d6f172c5d7d12743109c1f9e3e..c4d123f74bd34eb513aafbb7ad51dd7e73b73223 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;
 }