diff options
Diffstat (limited to 'arch/x86/kernel/msr.c')
-rw-r--r-- | arch/x86/kernel/msr.c | 4 |
1 files changed, 1 insertions, 3 deletions
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, | |||
162 | err = msr_device_create(cpu); | 162 | err = msr_device_create(cpu); |
163 | break; | 163 | break; |
164 | case CPU_UP_CANCELED: | 164 | case CPU_UP_CANCELED: |
165 | case CPU_UP_CANCELED_FROZEN: | ||
165 | case CPU_DEAD: | 166 | case CPU_DEAD: |
166 | msr_device_destroy(cpu); | 167 | msr_device_destroy(cpu); |
167 | break; | 168 | break; |
168 | case CPU_UP_CANCELED_FROZEN: | ||
169 | destroy_suspended_device(msr_class, MKDEV(MSR_MAJOR, cpu)); | ||
170 | break; | ||
171 | } | 169 | } |
172 | return err ? NOTIFY_BAD : NOTIFY_OK; | 170 | return err ? NOTIFY_BAD : NOTIFY_OK; |
173 | } | 171 | } |