diff options
Diffstat (limited to 'arch/x86/kernel/microcode.c')
-rw-r--r-- | arch/x86/kernel/microcode.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/x86/kernel/microcode.c b/arch/x86/kernel/microcode.c index 56b933119a04..652fa5c38ebe 100644 --- a/arch/x86/kernel/microcode.c +++ b/arch/x86/kernel/microcode.c | |||
@@ -644,7 +644,9 @@ static void microcode_fini_cpu(int cpu) | |||
644 | mutex_unlock(µcode_mutex); | 644 | mutex_unlock(µcode_mutex); |
645 | } | 645 | } |
646 | 646 | ||
647 | static ssize_t reload_store(struct sys_device *dev, const char *buf, size_t sz) | 647 | static ssize_t reload_store(struct sys_device *dev, |
648 | struct sysdev_attribute *attr, | ||
649 | const char *buf, size_t sz) | ||
648 | { | 650 | { |
649 | struct ucode_cpu_info *uci = ucode_cpu_info + dev->id; | 651 | struct ucode_cpu_info *uci = ucode_cpu_info + dev->id; |
650 | char *end; | 652 | char *end; |
@@ -655,9 +657,7 @@ static ssize_t reload_store(struct sys_device *dev, const char *buf, size_t sz) | |||
655 | if (end == buf) | 657 | if (end == buf) |
656 | return -EINVAL; | 658 | return -EINVAL; |
657 | if (val == 1) { | 659 | if (val == 1) { |
658 | cpumask_t old; | 660 | cpumask_t old = current->cpus_allowed; |
659 | |||
660 | old = current->cpus_allowed; | ||
661 | 661 | ||
662 | get_online_cpus(); | 662 | get_online_cpus(); |
663 | set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu)); | 663 | set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu)); |
@@ -674,14 +674,16 @@ static ssize_t reload_store(struct sys_device *dev, const char *buf, size_t sz) | |||
674 | return sz; | 674 | return sz; |
675 | } | 675 | } |
676 | 676 | ||
677 | static ssize_t version_show(struct sys_device *dev, char *buf) | 677 | static ssize_t version_show(struct sys_device *dev, |
678 | struct sysdev_attribute *attr, char *buf) | ||
678 | { | 679 | { |
679 | struct ucode_cpu_info *uci = ucode_cpu_info + dev->id; | 680 | struct ucode_cpu_info *uci = ucode_cpu_info + dev->id; |
680 | 681 | ||
681 | return sprintf(buf, "0x%x\n", uci->rev); | 682 | return sprintf(buf, "0x%x\n", uci->rev); |
682 | } | 683 | } |
683 | 684 | ||
684 | static ssize_t pf_show(struct sys_device *dev, char *buf) | 685 | static ssize_t pf_show(struct sys_device *dev, |
686 | struct sysdev_attribute *attr, char *buf) | ||
685 | { | 687 | { |
686 | struct ucode_cpu_info *uci = ucode_cpu_info + dev->id; | 688 | struct ucode_cpu_info *uci = ucode_cpu_info + dev->id; |
687 | 689 | ||