tree 42fbf4cd2a674d83e2363bab0729ca13b0aeae0a
parent 62b56faa43a7e672e659d14f38f553ed8b40ea70
author James Bottomley <[EMAIL PROTECTED]> Fri, 22 Apr 2005 06:20:35 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Fri, 22 Apr 2005 06:20:35 -0700
[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 <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
i386/kernel/cpu/amd.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: arch/i386/kernel/cpu/amd.c
===================================================================
--- 9120479b4c721855b378db8907e1259f2e583f2b/arch/i386/kernel/cpu/amd.c
(mode:100644 sha1:8d182e875cd72e64b49869386bf090ba23df6793)
+++ 42fbf4cd2a674d83e2363bab0729ca13b0aeae0a/arch/i386/kernel/cpu/amd.c
(mode:100644 sha1:16dbc4151be43b8e671869b2a52220f47ec0b6ac)
@@ -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
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
