diff options
| -rw-r--r-- | arch/x86/kernel/microcode_intel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c index b7f4c929e615..5e9f4fc51385 100644 --- a/arch/x86/kernel/microcode_intel.c +++ b/arch/x86/kernel/microcode_intel.c | |||
| @@ -87,9 +87,9 @@ | |||
| 87 | #include <linux/cpu.h> | 87 | #include <linux/cpu.h> |
| 88 | #include <linux/firmware.h> | 88 | #include <linux/firmware.h> |
| 89 | #include <linux/platform_device.h> | 89 | #include <linux/platform_device.h> |
| 90 | #include <linux/uaccess.h> | ||
| 90 | 91 | ||
| 91 | #include <asm/msr.h> | 92 | #include <asm/msr.h> |
| 92 | #include <asm/uaccess.h> | ||
| 93 | #include <asm/processor.h> | 93 | #include <asm/processor.h> |
| 94 | #include <asm/microcode.h> | 94 | #include <asm/microcode.h> |
| 95 | 95 | ||
| @@ -196,7 +196,7 @@ static inline int update_match_cpu(struct cpu_signature *csig, int sig, int pf) | |||
| 196 | return (!sigmatch(sig, csig->sig, pf, csig->pf)) ? 0 : 1; | 196 | return (!sigmatch(sig, csig->sig, pf, csig->pf)) ? 0 : 1; |
| 197 | } | 197 | } |
| 198 | 198 | ||
| 199 | static inline int | 199 | static inline int |
| 200 | update_match_revision(struct microcode_header_intel *mc_header, int rev) | 200 | update_match_revision(struct microcode_header_intel *mc_header, int rev) |
| 201 | { | 201 | { |
| 202 | return (mc_header->rev <= rev) ? 0 : 1; | 202 | return (mc_header->rev <= rev) ? 0 : 1; |
| @@ -442,8 +442,8 @@ static int request_microcode_fw(int cpu, struct device *device) | |||
| 442 | return ret; | 442 | return ret; |
| 443 | } | 443 | } |
| 444 | 444 | ||
| 445 | ret = generic_load_microcode(cpu, (void*)firmware->data, firmware->size, | 445 | ret = generic_load_microcode(cpu, (void *)firmware->data, |
| 446 | &get_ucode_fw); | 446 | firmware->size, &get_ucode_fw); |
| 447 | 447 | ||
| 448 | release_firmware(firmware); | 448 | release_firmware(firmware); |
| 449 | 449 | ||
| @@ -460,7 +460,7 @@ static int request_microcode_user(int cpu, const void __user *buf, size_t size) | |||
| 460 | /* We should bind the task to the CPU */ | 460 | /* We should bind the task to the CPU */ |
| 461 | BUG_ON(cpu != raw_smp_processor_id()); | 461 | BUG_ON(cpu != raw_smp_processor_id()); |
| 462 | 462 | ||
| 463 | return generic_load_microcode(cpu, (void*)buf, size, &get_ucode_user); | 463 | return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user); |
| 464 | } | 464 | } |
| 465 | 465 | ||
| 466 | static void microcode_fini_cpu(int cpu) | 466 | static void microcode_fini_cpu(int cpu) |
