Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] fix subarch breakage in amd dual core updates

Browse source 
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 <James.Bottomley@SteelEye.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
James Bottomley 2005-04-21 16:20:35 -07:00 committed by Linus Torvalds
parent 62b56faa43
commit 1cff94c6fe
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/i386/kernel/cpu/amd.c
View file

@ -24,7 +24,7 @@ __asm__(".align 4\nvide: ret");
static void __init init_amd(struct cpuinfo_x86 *c) 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; int cpu = c == &boot_cpu_data ? 0 : c - cpu_data;
#endif #endif
u32 l, h; u32 l, h;
@ -198,7 +198,7 @@ static void __init init_amd(struct cpuinfo_x86 *c)
c->x86_num_cores = 1; 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 * On a AMD dual core setup the lower bits of the APIC id
* distingush the cores. Assumes number of cores is a power * distingush the cores. Assumes number of cores is a power