diff options
| author | Andi Kleen <andi@basil.nowhere.org> | 2006-11-21 04:22:09 -0500 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-11-21 04:22:09 -0500 |
| commit | 1b7f6a626f0ff511c3840678466cbfe1d62c0b29 (patch) | |
| tree | 415e8c838c0067bff384afb8a2c91e5f7c6d11d3 /arch/i386/kernel/microcode.c | |
| parent | b3edc9cec07ade41aaf1804f7c9e876afa90c862 (diff) | |
| parent | 3f5a6ca31c334011fd929501a078424c0d3f71be (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/i386/kernel/microcode.c')
| -rw-r--r-- | arch/i386/kernel/microcode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/microcode.c b/arch/i386/kernel/microcode.c index c4d0291b519f..23f5984d0654 100644 --- a/arch/i386/kernel/microcode.c +++ b/arch/i386/kernel/microcode.c | |||
| @@ -577,7 +577,7 @@ static void microcode_init_cpu(int cpu) | |||
| 577 | set_cpus_allowed(current, cpumask_of_cpu(cpu)); | 577 | set_cpus_allowed(current, cpumask_of_cpu(cpu)); |
| 578 | mutex_lock(µcode_mutex); | 578 | mutex_lock(µcode_mutex); |
| 579 | collect_cpu_info(cpu); | 579 | collect_cpu_info(cpu); |
| 580 | if (uci->valid) | 580 | if (uci->valid && system_state == SYSTEM_RUNNING) |
| 581 | cpu_request_microcode(cpu); | 581 | cpu_request_microcode(cpu); |
| 582 | mutex_unlock(µcode_mutex); | 582 | mutex_unlock(µcode_mutex); |
| 583 | set_cpus_allowed(current, old); | 583 | set_cpus_allowed(current, old); |