diff options
Diffstat (limited to 'arch/x86/kernel/msr.c')
| -rw-r--r-- | arch/x86/kernel/msr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c index ee6eba4ecfea..21f6e3c0be18 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c | |||
| @@ -155,15 +155,15 @@ static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb, | |||
| 155 | 155 | ||
| 156 | switch (action) { | 156 | switch (action) { |
| 157 | case CPU_UP_PREPARE: | 157 | case CPU_UP_PREPARE: |
| 158 | case CPU_UP_PREPARE_FROZEN: | ||
| 159 | err = msr_device_create(cpu); | 158 | err = msr_device_create(cpu); |
| 160 | break; | 159 | break; |
| 161 | case CPU_UP_CANCELED: | 160 | case CPU_UP_CANCELED: |
| 162 | case CPU_UP_CANCELED_FROZEN: | ||
| 163 | case CPU_DEAD: | 161 | case CPU_DEAD: |
| 164 | case CPU_DEAD_FROZEN: | ||
| 165 | msr_device_destroy(cpu); | 162 | msr_device_destroy(cpu); |
| 166 | break; | 163 | break; |
| 164 | case CPU_UP_CANCELED_FROZEN: | ||
| 165 | destroy_suspended_device(msr_class, MKDEV(MSR_MAJOR, cpu)); | ||
| 166 | break; | ||
| 167 | } | 167 | } |
| 168 | return err ? NOTIFY_BAD : NOTIFY_OK; | 168 | return err ? NOTIFY_BAD : NOTIFY_OK; |
| 169 | } | 169 | } |
