diff options
author | Dmitry Adamushko <dmitry.adamushko@gmail.com> | 2008-08-19 18:16:13 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 06:18:55 -0400 |
commit | 8343ef2437c599d30568e6b5a257a40bf2f4902b (patch) | |
tree | d7d2dc700536b628aea8e85aca113869263dde09 /arch/x86/kernel/microcode_intel.c | |
parent | 636a31781684d0f49208aa163f1a5a3a74210eb4 (diff) |
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>
Diffstat (limited to 'arch/x86/kernel/microcode_intel.c')
-rw-r--r-- | arch/x86/kernel/microcode_intel.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c index d2d9d74f4cbb..6dd8907ff22e 100644 --- a/arch/x86/kernel/microcode_intel.c +++ b/arch/x86/kernel/microcode_intel.c | |||
@@ -531,12 +531,14 @@ static struct microcode_ops microcode_intel_ops = { | |||
531 | 531 | ||
532 | static int __init microcode_intel_module_init(void) | 532 | static int __init microcode_intel_module_init(void) |
533 | { | 533 | { |
534 | struct cpuinfo_x86 *c = &cpu_data(get_cpu()); | 534 | struct cpuinfo_x86 *c = &cpu_data(0); |
535 | 535 | ||
536 | if (c->x86_vendor == X86_VENDOR_INTEL) | 536 | if (c->x86_vendor != X86_VENDOR_INTEL) { |
537 | return microcode_init(µcode_intel_ops, THIS_MODULE); | 537 | printk(KERN_ERR "microcode: CPU platform is not Intel-capable\n"); |
538 | else | ||
539 | return -ENODEV; | 538 | return -ENODEV; |
539 | } | ||
540 | |||
541 | return microcode_init(µcode_intel_ops, THIS_MODULE); | ||
540 | } | 542 | } |
541 | 543 | ||
542 | static void __exit microcode_intel_module_exit(void) | 544 | static void __exit microcode_intel_module_exit(void) |