1.1 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c	Mon Nov 22 11:44:13 2004 +0000
     1.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c	Wed Nov 24 11:49:43 2004 +0000
     1.3 @@ -332,9 +332,9 @@ static void __init synchronize_tsc_ap (v
     1.4  	}
     1.5  }
     1.6  #undef NR_LOOPS
     1.7 +#endif
     1.8  
     1.9  extern void calibrate_delay(void);
    1.10 -#endif
    1.11  
    1.12  static atomic_t init_deasserted;
    1.13  
    1.14 @@ -403,8 +403,8 @@ void __init smp_callin(void)
    1.15  	Dprintk("CALLIN, before setup_local_APIC().\n");
    1.16  	smp_callin_clear_local_apic();
    1.17  	setup_local_APIC();
    1.18 +#endif
    1.19  	map_cpu_to_logical_apicid();
    1.20 -#endif
    1.21  
    1.22  	local_irq_enable();
    1.23  
    1.24 @@ -567,15 +567,11 @@ u8 cpu_2_logical_apicid[NR_CPUS] = { [0 
    1.25  
    1.26  void map_cpu_to_logical_apicid(void)
    1.27  {
    1.28 -#if 1
    1.29 -	xxprint("map_cpu_to_logical_apicid\n");
    1.30 -#else
    1.31  	int cpu = smp_processor_id();
    1.32 -	int apicid = logical_smp_processor_id();
    1.33 +	int apicid = smp_processor_id();
    1.34  
    1.35  	cpu_2_logical_apicid[cpu] = apicid;
    1.36  	map_cpu_to_node(cpu, apicid_to_node(apicid));
    1.37 -#endif
    1.38  }
    1.39  
    1.40  void unmap_cpu_to_logical_apicid(int cpu)
    1.41 @@ -958,7 +954,7 @@ static int __init do_boot_cpu(int apicid
    1.42  	x86_cpu_to_apicid[cpu] = apicid;
    1.43  	if (boot_error) {
    1.44  		/* Try to put things back the way they were before ... */
    1.45 -		// unmap_cpu_to_logical_apicid(cpu);
    1.46 +		unmap_cpu_to_logical_apicid(cpu);
    1.47  		cpu_clear(cpu, cpu_callout_map); /* was set here (do_boot_cpu()) */
    1.48  		cpu_clear(cpu, cpu_initialized); /* was set by cpu_init() */
    1.49  		cpucount--;
    1.50 @@ -1175,7 +1171,9 @@ static void __init smp_boot_cpus(unsigne
    1.51  #if 0
    1.52  	connect_bsp_APIC();
    1.53  	setup_local_APIC();
    1.54 +#endif
    1.55  	map_cpu_to_logical_apicid();
    1.56 +#if 0
    1.57  
    1.58  
    1.59  	setup_portio_remap();