diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 14:22:45 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 14:22:45 -0700 |
commit | d25e6b0b326278a1096e8334584c3e64517057a3 (patch) | |
tree | 3c914b877adf9615c7158b58705478e56c9b4247 /arch/x86/kernel/cpu/amd.c | |
parent | e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4 (diff) | |
parent | 40ffa93791985ab300fd488072e9f37ccf72e88c (diff) | |
download | talos-obmc-linux-d25e6b0b326278a1096e8334584c3e64517057a3.tar.gz talos-obmc-linux-d25e6b0b326278a1096e8334584c3e64517057a3.zip |
Merge branch 'x86/cleanups' into x86/trampoline
Diffstat (limited to 'arch/x86/kernel/cpu/amd.c')
-rw-r--r-- | arch/x86/kernel/cpu/amd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index ba5f62f45f01..a8b4d91b8394 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -148,7 +148,7 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c) { #ifdef CONFIG_SMP /* calling is from identify_secondary_cpu() ? */ - if (c->cpu_index == boot_cpu_id) + if (!c->cpu_index) return; /* |