diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 16:40:34 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 16:40:42 +0200 |
| commit | 5e62feabcc3e4127a084701ec54ffe891985b7e8 (patch) | |
| tree | 9246462da99ef4eb53c9c89a137d0a88c897f3d6 /arch/x86/kernel/cpu/amd.c | |
| parent | 8ffcfa4e2d96342180e02dfe1230b97778c52d72 (diff) | |
| parent | 234bb549eea16ec7d5207ba747fb8dbf489e64c1 (diff) | |
Merge branch 'x86/cleanups' into irq/sparseirq
Reason: Avoid conflicts with removal of boot_cpu_id
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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; /* |