Remove XXX_FROZEN state from x86/microcode/core.

Signed-off-by: Chen, Gong <gong.c...@linux.intel.com>
---
 arch/x86/kernel/cpu/microcode/core.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/cpu/microcode/core.c 
b/arch/x86/kernel/cpu/microcode/core.c
index dd9d619..27e47be 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -499,6 +499,10 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long 
action, void *hcpu)
                pr_debug("CPU%d removed\n", cpu);
                break;
 
+       case CPU_UP_CANCELED:
+               /* The CPU refused to come up during a system resume */
+               if (action & CPU_TASKS_FROZEN)
+                       microcode_fini_cpu(cpu);
        /*
         * case CPU_DEAD:
         *
@@ -509,10 +513,6 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long 
action, void *hcpu)
         */
        }
 
-       /* The CPU refused to come up during a system resume */
-       if (action == CPU_UP_CANCELED_FROZEN)
-               microcode_fini_cpu(cpu);
-
        return NOTIFY_OK;
 }
 
-- 
2.0.0.rc2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to