Commit 8343ef24 authored by Dmitry Adamushko's avatar Dmitry Adamushko Committed by Ingo Molnar

x86-microcode: fix unbalanced use of get_cpu()

Don't use get_cpu() at all. Resort to checking a boot-up CPU (#0) in
microcode_{intel,amd}_module_init().
Signed-off-by: default avatarDmitry Adamushko <dmitry.adamushko@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 636a3178
...@@ -500,13 +500,15 @@ static struct microcode_ops microcode_amd_ops = { ...@@ -500,13 +500,15 @@ static struct microcode_ops microcode_amd_ops = {
static int __init microcode_amd_module_init(void) static int __init microcode_amd_module_init(void)
{ {
struct cpuinfo_x86 *c = &cpu_data(get_cpu()); struct cpuinfo_x86 *c = &cpu_data(0);
equiv_cpu_table = NULL; equiv_cpu_table = NULL;
if (c->x86_vendor == X86_VENDOR_AMD) if (c->x86_vendor != X86_VENDOR_AMD) {
return microcode_init(&microcode_amd_ops, THIS_MODULE); printk(KERN_ERR "microcode: CPU platform is not AMD-capable\n");
else
return -ENODEV; return -ENODEV;
}
return microcode_init(&microcode_amd_ops, THIS_MODULE);
} }
static void __exit microcode_amd_module_exit(void) static void __exit microcode_amd_module_exit(void)
......
...@@ -531,12 +531,14 @@ static struct microcode_ops microcode_intel_ops = { ...@@ -531,12 +531,14 @@ static struct microcode_ops microcode_intel_ops = {
static int __init microcode_intel_module_init(void) static int __init microcode_intel_module_init(void)
{ {
struct cpuinfo_x86 *c = &cpu_data(get_cpu()); struct cpuinfo_x86 *c = &cpu_data(0);
if (c->x86_vendor == X86_VENDOR_INTEL) if (c->x86_vendor != X86_VENDOR_INTEL) {
return microcode_init(&microcode_intel_ops, THIS_MODULE); printk(KERN_ERR "microcode: CPU platform is not Intel-capable\n");
else
return -ENODEV; return -ENODEV;
}
return microcode_init(&microcode_intel_ops, THIS_MODULE);
} }
static void __exit microcode_intel_module_exit(void) static void __exit microcode_intel_module_exit(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment