|
@@ -87,9 +87,9 @@
|
|
#include <linux/cpu.h>
|
|
#include <linux/cpu.h>
|
|
#include <linux/firmware.h>
|
|
#include <linux/firmware.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
+#include <linux/uaccess.h>
|
|
|
|
|
|
#include <asm/msr.h>
|
|
#include <asm/msr.h>
|
|
-#include <asm/uaccess.h>
|
|
|
|
#include <asm/processor.h>
|
|
#include <asm/processor.h>
|
|
#include <asm/microcode.h>
|
|
#include <asm/microcode.h>
|
|
|
|
|
|
@@ -196,7 +196,7 @@ static inline int update_match_cpu(struct cpu_signature *csig, int sig, int pf)
|
|
return (!sigmatch(sig, csig->sig, pf, csig->pf)) ? 0 : 1;
|
|
return (!sigmatch(sig, csig->sig, pf, csig->pf)) ? 0 : 1;
|
|
}
|
|
}
|
|
|
|
|
|
-static inline int
|
|
|
|
|
|
+static inline int
|
|
update_match_revision(struct microcode_header_intel *mc_header, int rev)
|
|
update_match_revision(struct microcode_header_intel *mc_header, int rev)
|
|
{
|
|
{
|
|
return (mc_header->rev <= rev) ? 0 : 1;
|
|
return (mc_header->rev <= rev) ? 0 : 1;
|
|
@@ -442,8 +442,8 @@ static int request_microcode_fw(int cpu, struct device *device)
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
- ret = generic_load_microcode(cpu, (void*)firmware->data, firmware->size,
|
|
|
|
- &get_ucode_fw);
|
|
|
|
|
|
+ ret = generic_load_microcode(cpu, (void *)firmware->data,
|
|
|
|
+ firmware->size, &get_ucode_fw);
|
|
|
|
|
|
release_firmware(firmware);
|
|
release_firmware(firmware);
|
|
|
|
|
|
@@ -460,7 +460,7 @@ static int request_microcode_user(int cpu, const void __user *buf, size_t size)
|
|
/* We should bind the task to the CPU */
|
|
/* We should bind the task to the CPU */
|
|
BUG_ON(cpu != raw_smp_processor_id());
|
|
BUG_ON(cpu != raw_smp_processor_id());
|
|
|
|
|
|
- return generic_load_microcode(cpu, (void*)buf, size, &get_ucode_user);
|
|
|
|
|
|
+ return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
|
|
}
|
|
}
|
|
|
|
|
|
static void microcode_fini_cpu(int cpu)
|
|
static void microcode_fini_cpu(int cpu)
|