ia64/linux-2.6.18-xen.hg

changeset 458:eb906651be99

Revert 419:0034d9389 and 425:9dea529497.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Sat Mar 01 09:19:27 2008 +0000 (2008-03-01)
parents 68e78169679e
children 26ba302987ce
files drivers/xen/core/smpboot.c
line diff
     1.1 --- a/drivers/xen/core/smpboot.c	Fri Feb 29 09:20:31 2008 -0700
     1.2 +++ b/drivers/xen/core/smpboot.c	Sat Mar 01 09:19:27 2008 +0000
     1.3 @@ -70,13 +70,6 @@ EXPORT_SYMBOL(x86_cpu_to_apicid);
     1.4  unsigned int maxcpus = NR_CPUS;
     1.5  #endif
     1.6  
     1.7 -#ifdef CONFIG_ACPI
     1.8 -#define set_x86_acpiid_to_apicid(acpiid, apicid) \
     1.9 -	(x86_acpiid_to_apicid[acpiid] = apicid)
    1.10 -#else
    1.11 -#define set_x86_acpiid_to_apicid(acpiid, apicid) ((void)0)
    1.12 -#endif
    1.13 -
    1.14  void __init prefill_possible_map(void)
    1.15  {
    1.16  	int i, rc;
    1.17 @@ -276,7 +269,6 @@ void __init smp_prepare_cpus(unsigned in
    1.18  
    1.19  	cpu_2_logical_apicid[0] = 0;
    1.20  	x86_cpu_to_apicid[0] = 0;
    1.21 -	set_x86_acpiid_to_apicid(0, 0);
    1.22  
    1.23  	current_thread_info()->cpu = 0;
    1.24  
    1.25 @@ -325,7 +317,6 @@ void __init smp_prepare_cpus(unsigned in
    1.26  
    1.27  		cpu_2_logical_apicid[cpu] = cpu;
    1.28  		x86_cpu_to_apicid[cpu] = cpu;
    1.29 -		set_x86_acpiid_to_apicid(cpu, cpu);
    1.30  
    1.31  		idle = fork_idle(cpu);
    1.32  		if (IS_ERR(idle))