diff options
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/microcode.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86/kernel/microcode.c b/arch/x86/kernel/microcode.c index f2702d01b8a8..25cf6dee4e56 100644 --- a/arch/x86/kernel/microcode.c +++ b/arch/x86/kernel/microcode.c | |||
@@ -290,7 +290,7 @@ static int get_maching_microcode(void *mc, int cpu) | |||
290 | } | 290 | } |
291 | return 0; | 291 | return 0; |
292 | find: | 292 | find: |
293 | pr_debug("microcode: CPU %d found a matching microcode update with" | 293 | pr_debug("microcode: CPU%d found a matching microcode update with" |
294 | " version 0x%x (current=0x%x)\n", cpu, mc_header->rev,uci->rev); | 294 | " version 0x%x (current=0x%x)\n", cpu, mc_header->rev,uci->rev); |
295 | new_mc = vmalloc(total_size); | 295 | new_mc = vmalloc(total_size); |
296 | if (!new_mc) { | 296 | if (!new_mc) { |
@@ -336,11 +336,11 @@ static void apply_microcode(int cpu) | |||
336 | 336 | ||
337 | spin_unlock_irqrestore(µcode_update_lock, flags); | 337 | spin_unlock_irqrestore(µcode_update_lock, flags); |
338 | if (val[1] != uci->mc->hdr.rev) { | 338 | if (val[1] != uci->mc->hdr.rev) { |
339 | printk(KERN_ERR "microcode: CPU%d updated from revision " | 339 | printk(KERN_ERR "microcode: CPU%d update from revision " |
340 | "0x%x to 0x%x failed\n", cpu_num, uci->rev, val[1]); | 340 | "0x%x to 0x%x failed\n", cpu_num, uci->rev, val[1]); |
341 | return; | 341 | return; |
342 | } | 342 | } |
343 | pr_debug("microcode: CPU%d updated from revision " | 343 | printk(KERN_INFO "microcode: CPU%d updated from revision " |
344 | "0x%x to 0x%x, date = %08x \n", | 344 | "0x%x to 0x%x, date = %08x \n", |
345 | cpu_num, uci->rev, val[1], uci->mc->hdr.date); | 345 | cpu_num, uci->rev, val[1], uci->mc->hdr.date); |
346 | uci->rev = val[1]; | 346 | uci->rev = val[1]; |
@@ -534,7 +534,7 @@ static int cpu_request_microcode(int cpu) | |||
534 | c->x86, c->x86_model, c->x86_mask); | 534 | c->x86, c->x86_model, c->x86_mask); |
535 | error = request_firmware(&firmware, name, µcode_pdev->dev); | 535 | error = request_firmware(&firmware, name, µcode_pdev->dev); |
536 | if (error) { | 536 | if (error) { |
537 | pr_debug("ucode data file %s load failed\n", name); | 537 | pr_debug("microcode: ucode data file %s load failed\n", name); |
538 | return error; | 538 | return error; |
539 | } | 539 | } |
540 | buf = firmware->data; | 540 | buf = firmware->data; |
@@ -709,7 +709,7 @@ static int __mc_sysdev_add(struct sys_device *sys_dev, int resume) | |||
709 | if (!cpu_online(cpu)) | 709 | if (!cpu_online(cpu)) |
710 | return 0; | 710 | return 0; |
711 | 711 | ||
712 | pr_debug("Microcode:CPU %d added\n", cpu); | 712 | pr_debug("microcode: CPU%d added\n", cpu); |
713 | memset(uci, 0, sizeof(*uci)); | 713 | memset(uci, 0, sizeof(*uci)); |
714 | 714 | ||
715 | err = sysfs_create_group(&sys_dev->kobj, &mc_attr_group); | 715 | err = sysfs_create_group(&sys_dev->kobj, &mc_attr_group); |
@@ -733,7 +733,7 @@ static int mc_sysdev_remove(struct sys_device *sys_dev) | |||
733 | if (!cpu_online(cpu)) | 733 | if (!cpu_online(cpu)) |
734 | return 0; | 734 | return 0; |
735 | 735 | ||
736 | pr_debug("Microcode:CPU %d removed\n", cpu); | 736 | pr_debug("microcode: CPU%d removed\n", cpu); |
737 | microcode_fini_cpu(cpu); | 737 | microcode_fini_cpu(cpu); |
738 | sysfs_remove_group(&sys_dev->kobj, &mc_attr_group); | 738 | sysfs_remove_group(&sys_dev->kobj, &mc_attr_group); |
739 | return 0; | 739 | return 0; |
@@ -745,7 +745,7 @@ static int mc_sysdev_resume(struct sys_device *dev) | |||
745 | 745 | ||
746 | if (!cpu_online(cpu)) | 746 | if (!cpu_online(cpu)) |
747 | return 0; | 747 | return 0; |
748 | pr_debug("Microcode:CPU %d resumed\n", cpu); | 748 | pr_debug("microcode: CPU%d resumed\n", cpu); |
749 | /* only CPU 0 will apply ucode here */ | 749 | /* only CPU 0 will apply ucode here */ |
750 | apply_microcode(0); | 750 | apply_microcode(0); |
751 | return 0; | 751 | return 0; |
@@ -783,7 +783,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu) | |||
783 | } | 783 | } |
784 | case CPU_DOWN_FAILED_FROZEN: | 784 | case CPU_DOWN_FAILED_FROZEN: |
785 | if (sysfs_create_group(&sys_dev->kobj, &mc_attr_group)) | 785 | if (sysfs_create_group(&sys_dev->kobj, &mc_attr_group)) |
786 | printk(KERN_ERR "Microcode: Failed to create the sysfs " | 786 | printk(KERN_ERR "microcode: Failed to create the sysfs " |
787 | "group for CPU%d\n", cpu); | 787 | "group for CPU%d\n", cpu); |
788 | break; | 788 | break; |
789 | case CPU_DOWN_PREPARE: | 789 | case CPU_DOWN_PREPARE: |