dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Dmitry Adamushko <dmitry.adamushko@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Dmitry Adamushko 2008-08-20 00:16:13 +02:00 committed by Ingo Molnar
parent 636a317816
commit 8343ef2437
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/kernel/microcode_amd.c
View File

@ -500,13 +500,15 @@ static struct microcode_ops microcode_amd_ops = {
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;
if (c->x86_vendor == X86_VENDOR_AMD)
return microcode_init(&microcode_amd_ops, THIS_MODULE);
else
if (c->x86_vendor != X86_VENDOR_AMD) {
printk(KERN_ERR "microcode: CPU platform is not AMD-capable\n");
return -ENODEV;
}
return microcode_init(&microcode_amd_ops, THIS_MODULE);
}
static void __exit microcode_amd_module_exit(void)

10
arch/x86/kernel/microcode_intel.c
View File

@ -531,12 +531,14 @@ static struct microcode_ops microcode_intel_ops = {
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)
return microcode_init(&microcode_intel_ops, THIS_MODULE);
else
if (c->x86_vendor != X86_VENDOR_INTEL) {
printk(KERN_ERR "microcode: CPU platform is not Intel-capable\n");
return -ENODEV;
}
return microcode_init(&microcode_intel_ops, THIS_MODULE);
}
static void __exit microcode_intel_module_exit(void)