diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /arch/i386/kernel/microcode.c | |
| parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
| parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (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); |