From 5052201b4af52c2b32e8fb580d27074f4e427d36 Mon Sep 17 00:00:00 2001 From: Fenghua Yu Date: Thu, 20 Dec 2012 23:44:24 -0800 Subject: [PATCH] --- yaml --- r: 356269 b: refs/heads/master c: e6ebf5deaaaa33b661f0db86380c232b162bd68c h: refs/heads/master i: 356267: e0376f1e632bba54005454060a4778c09f0879c2 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/common.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2b3ceb9408a3..dd222132341e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d288e1cf8e62f3e4034f1f021f047009c4ac0b3c +refs/heads/master: e6ebf5deaaaa33b661f0db86380c232b162bd68c diff --git a/trunk/arch/x86/kernel/cpu/common.c b/trunk/arch/x86/kernel/cpu/common.c index d7fd2468752a..d814772c5bed 100644 --- a/trunk/arch/x86/kernel/cpu/common.c +++ b/trunk/arch/x86/kernel/cpu/common.c @@ -1220,6 +1220,12 @@ void __cpuinit cpu_init(void) int cpu; int i; + /* + * Load microcode on this cpu if a valid microcode is available. + * This is early microcode loading procedure. + */ + load_ucode_ap(); + cpu = stack_smp_processor_id(); t = &per_cpu(init_tss, cpu); oist = &per_cpu(orig_ist, cpu); @@ -1311,6 +1317,8 @@ void __cpuinit cpu_init(void) struct tss_struct *t = &per_cpu(init_tss, cpu); struct thread_struct *thread = &curr->thread; + show_ucode_info_early(); + if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { printk(KERN_WARNING "CPU#%d already initialized!\n", cpu); for (;;)