Merge branch 'fixes-v3.15-rc1'; commit '390403fd79821bbd0c3a0d83307df2be87047b36...

[cascardo/linux.git] / lib / percpu_counter.c

diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index 8280a5d..7dd3357 100644 (file)
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -169,7 +169,7 @@ static int percpu_counter_hotcpu_callback(struct notifier_block *nb,
        struct percpu_counter *fbc;
 
        compute_batch_value();
-       if (action != CPU_DEAD)
+       if (action != CPU_DEAD && action != CPU_DEAD_FROZEN)
                return NOTIFY_OK;
 
        cpu = (unsigned long)hcpu;