fix subarch breakage in amd dual core updates
PATCH 1/1 fix subarch breakage in amd dual core updates
The patch to arch/i386/kernel/cpu/amd.c relies on the variable cpu_core_id which is defined in i386/kernel/smpboot.c. This means it is only present if CONFIG_X86_SMP is defined, not CONFIG_SMP (alternative SMP harnesses won't have it, which is why it breaks voyager).
Signed-off-by James Bottomley <[email protected]>
arch/i386/kernel/cpu/amd.c: 8d182e875cd72e64b49869386bf090ba23df6793
arch/i386/kernel/cpu/amd.c +2 -2
@@ -24,7 +24,7 @@ __asm__(".align 4\nvide: ret");static void __init init_amd (struct cpuinfo_x86 *c) { -#ifdef CONFIG_SMP +#ifdef CONFIG_X86_SMP int cpu = c == &boot_cpu_data ?0 : c - cpu_data;#endif u32 l, h;
@@ -198,7 +198,7 @@ static void __init init_amd(struct cpuin c->x86_num_cores =1 ; } -#ifdef CONFIG_SMP +#ifdef CONFIG_X86_SMP /* * On a AMD dual core setup the lower bits of the APIC id * distingush the cores. Assumes number of cores is a power