Commit 1cff94c6 authored Apr 21, 2005 by James Bottomley Committed by Linus Torvalds Apr 21, 2005

[PATCH] 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 <James.Bottomley@SteelEye.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 62b56faa

arch/i386/kernel/cpu/amd.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 cpuinfo_x86 *c)
		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