From ef2864c0f83c1a8f76ca2488fb5300e8ed15aad5 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Wed, 8 Nov 2006 17:44:37 -0800 Subject: [PATCH] --- yaml --- r: 40815 b: refs/heads/master c: d654c673d6394bc26e159b1057b357371b4ce1dc h: refs/heads/master i: 40813: aad2033363da8cbbc874b7e199bc1cca500ed34c 40811: 349aa3a7c710bd0724b397dcb331d092f10a17ff 40807: ab8cf2ae526a0e9ffa3e68652775204a2cbdc3fb 40799: 7a80950326353706f5cfbf70fbde94f19eecb0bf v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/microcode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2701106b8646..9c4bdc5ec218 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 082f2f84be5db164280483efa7eb1549d867353d +refs/heads/master: d654c673d6394bc26e159b1057b357371b4ce1dc diff --git a/trunk/arch/i386/kernel/microcode.c b/trunk/arch/i386/kernel/microcode.c index c4d0291b519f..23f5984d0654 100644 --- a/trunk/arch/i386/kernel/microcode.c +++ b/trunk/arch/i386/kernel/microcode.c @@ -577,7 +577,7 @@ static void microcode_init_cpu(int cpu) set_cpus_allowed(current, cpumask_of_cpu(cpu)); mutex_lock(µcode_mutex); collect_cpu_info(cpu); - if (uci->valid) + if (uci->valid && system_state == SYSTEM_RUNNING) cpu_request_microcode(cpu); mutex_unlock(µcode_mutex); set_cpus_allowed(current, old);