[Xen-changelog] [linux-2.6.18-xen] Revert 419:0034d9389 and 425:9dea529497.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1204363167 0
# Node ID eb906651be99d2e93850f809a70c32bf60881b01
# Parent  68e78169679ed2681fa24c8603f40a82266b8223
Revert 419:0034d9389 and 425:9dea529497.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 drivers/xen/core/smpboot.c |    9 ---------
 1 files changed, 9 deletions(-)

diff -r 68e78169679e -r eb906651be99 drivers/xen/core/smpboot.c
--- a/drivers/xen/core/smpboot.c        Fri Feb 29 09:20:31 2008 -0700
+++ b/drivers/xen/core/smpboot.c        Sat Mar 01 09:19:27 2008 +0000
@@ -70,13 +70,6 @@ unsigned int maxcpus = NR_CPUS;
 unsigned int maxcpus = NR_CPUS;
 #endif
 
-#ifdef CONFIG_ACPI
-#define set_x86_acpiid_to_apicid(acpiid, apicid) \
-       (x86_acpiid_to_apicid[acpiid] = apicid)
-#else
-#define set_x86_acpiid_to_apicid(acpiid, apicid) ((void)0)
-#endif
-
 void __init prefill_possible_map(void)
 {
        int i, rc;
@@ -276,7 +269,6 @@ 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);
 
        current_thread_info()->cpu = 0;
 
@@ -325,7 +317,6 @@ 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);
 
                idle = fork_idle(cpu);
                if (IS_ERR(idle))

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog