Remove XXX_FROZEN state from x86/kernel/cpuid.
Signed-off-by: Chen, Gong <gong.c...@linux.intel.com>
---
arch/x86/kernel/cpuid.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index 3225ae6c..0288e4f 100644
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -161,12 +161,14 @@ static int cpuid_class_cpu_callback(struct notifier_block
*nfb,
case CPU_UP_PREPARE:
err = cpuid_device_create(cpu);
break;
- case CPU_UP_CANCELED:
- case CPU_UP_CANCELED_FROZEN:
case CPU_DEAD:
cpuid_device_destroy(cpu);
break;
}
+
+ if ((action & ~CPU_TASKS_FROZEN) == CPU_UP_CANCELED)
+ cpuid_device_destroy(cpu);
+
return notifier_from_errno(err);
}
--
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/
