2 files changed, 2 insertions, 6 deletions

diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index 288e7a6598ac..daff52a62248 100644
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -154,12 +154,10 @@ static int __cpuinit cpuid_class_cpu_callback(struct notifier_block *nfb,
                 err = cpuid_device_create(cpu);
                 break;
         case CPU_UP_CANCELED:
+        case CPU_UP_CANCELED_FROZEN:
         case CPU_DEAD:
                 cpuid_device_destroy(cpu);
                 break;
-        case CPU_UP_CANCELED_FROZEN:
-                destroy_suspended_device(cpuid_class, MKDEV(CPUID_MAJOR, cpu));
-                break;
         }
         return err ? NOTIFY_BAD : NOTIFY_OK;
 }
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 4dfb40530057..1f3abe048e93 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -162,12 +162,10 @@ static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb,
                 err = msr_device_create(cpu);
                 break;
         case CPU_UP_CANCELED:
+        case CPU_UP_CANCELED_FROZEN:
         case CPU_DEAD:
                 msr_device_destroy(cpu);
                 break;
-        case CPU_UP_CANCELED_FROZEN:
-                destroy_suspended_device(msr_class, MKDEV(MSR_MAJOR, cpu));
-                break;
         }
         return err ? NOTIFY_BAD : NOTIFY_OK;
 }