[PATCH] limit ACPIID to APICID reset to AMD machines

[Mark Langsdorf <mark.langsdorf@amd.com>]

Testing by Red Hat show that changeset:0034d9389130 causes regressions
on Intel machines that don't use APIC ID lifting but that do have a
strange ACPI to APIC numbering.

Modify the patch so that it only applies to AMD machines.

-Mark Langsdorf
Operating System Research Center
AMD

Signed-off-by: Mark Langsdorf <mark.langsdorf@amd.com>

diff -r 49ffe9ef67d4 drivers/xen/core/smpboot.c
--- a/drivers/xen/core/smpboot.c	Fri Feb 29 10:29:13 2008 +0000
+++ b/drivers/xen/core/smpboot.c	Fri Feb 29 12:54:47 2008 -0600
@@ -276,7 +276,8 @@ void __init smp_prepare_cpus(unsigned in
 
 	cpu_2_logical_apicid[0] = 0;
 	x86_cpu_to_apicid[0] = 0;
-	set_x86_acpiid_to_apicid(0, 0);
+	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
+		set_x86_acpiid_to_apicid(0, 0);
 
 	current_thread_info()->cpu = 0;
 
@@ -325,7 +326,8 @@ void __init smp_prepare_cpus(unsigned in
 
 		cpu_2_logical_apicid[cpu] = cpu;
 		x86_cpu_to_apicid[cpu] = cpu;
-		set_x86_acpiid_to_apicid(cpu, cpu);
+		if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
+			set_x86_acpiid_to_apicid(cpu, cpu);
 
 		idle = fork_idle(cpu);
 		if (IS_ERR(idle))