x86, MCE: Kill CPU_POST_DEAD

In conjunction with cleaning up CPU hotplug, we want to get rid of
CPU_POST_DEAD. Kill this instance here and rediscover CMCI banks at the
end of CPU_DEAD.

Link: http://lkml.kernel.org/r/http://lkml.kernel.org/r/1400750624-19238-1-git-send-email-bp@alien8.de
Signed-off-by: Borislav Petkov <bp@suse.de>

1 files changed, 4 insertions, 5 deletions

diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index bb92f38153b2..8fecdd34f2d2 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -2385,6 +2385,10 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
                         threshold_cpu_callback(action, cpu);
                 mce_device_remove(cpu);
                 mce_intel_hcpu_update(cpu);
+
+                /* intentionally ignoring frozen here */
+                if (!(action & CPU_TASKS_FROZEN))
+                        cmci_rediscover();
                 break;
         case CPU_DOWN_PREPARE:
                 smp_call_function_single(cpu, mce_disable_cpu, &action, 1);
@@ -2396,11 +2400,6 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
                 break;
         }
 
-        if (action == CPU_POST_DEAD) {
-                /* intentionally ignoring frozen here */
-                cmci_rediscover();
-        }
-
         return NOTIFY_OK;
 }