ia64/xen-unstable

changeset 13018:fe2e013ae5cb

[LINUX] Fix build without CONFIG_HOTPLUG_CPU
Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kfraser@localhost.localdomain
date Thu Dec 14 10:32:38 2006 +0000 (2006-12-14)
parents d2f12edc10ee
children 8a97b4a43a3d
files linux-2.6-xen-sparse/drivers/xen/core/smpboot.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c	Thu Dec 14 10:31:31 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c	Thu Dec 14 10:32:38 2006 +0000
     1.3 @@ -110,6 +110,18 @@ set_cpu_sibling_map(int cpu)
     1.4  	cpu_data[cpu].booted_cores = 1;
     1.5  }
     1.6  
     1.7 +static void
     1.8 +remove_siblinginfo(int cpu)
     1.9 +{
    1.10 +	phys_proc_id[cpu] = BAD_APICID;
    1.11 +	cpu_core_id[cpu]  = BAD_APICID;
    1.12 +
    1.13 +	cpus_clear(cpu_sibling_map[cpu]);
    1.14 +	cpus_clear(cpu_core_map[cpu]);
    1.15 +
    1.16 +	cpu_data[cpu].booted_cores = 0;
    1.17 +}
    1.18 +
    1.19  static int xen_smp_intr_init(unsigned int cpu)
    1.20  {
    1.21  	int rc;
    1.22 @@ -358,18 +370,6 @@ static int __init initialize_cpu_present
    1.23  }
    1.24  core_initcall(initialize_cpu_present_map);
    1.25  
    1.26 -static void
    1.27 -remove_siblinginfo(int cpu)
    1.28 -{
    1.29 -	phys_proc_id[cpu] = BAD_APICID;
    1.30 -	cpu_core_id[cpu]  = BAD_APICID;
    1.31 -
    1.32 -	cpus_clear(cpu_sibling_map[cpu]);
    1.33 -	cpus_clear(cpu_core_map[cpu]);
    1.34 -
    1.35 -	cpu_data[cpu].booted_cores = 0;
    1.36 -}
    1.37 -
    1.38  int __cpu_disable(void)
    1.39  {
    1.40  	cpumask_t map = cpu_online_map;
    1.41 @@ -433,7 +433,6 @@ int __devinit __cpu_up(unsigned int cpu)
    1.42  	set_cpu_sibling_map(cpu);
    1.43  	wmb();
    1.44  
    1.45 -
    1.46  	rc = xen_smp_intr_init(cpu);
    1.47  	if (rc) {
    1.48  		remove_siblinginfo(cpu);