1 files changed, 3 insertions, 0 deletions

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;
 }