ia64/xen-unstable

changeset 18709:10d338e5f741

x86, smpboot: A few code cleanups.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Oct 22 16:47:44 2008 +0100 (2008-10-22)
parents 71faca83998d
children 635a9691a8a9
files xen/arch/x86/smpboot.c
line diff
     1.1 --- a/xen/arch/x86/smpboot.c	Wed Oct 22 16:41:33 2008 +0100
     1.2 +++ b/xen/arch/x86/smpboot.c	Wed Oct 22 16:47:44 2008 +0100
     1.3 @@ -112,7 +112,7 @@ static void map_cpu_to_logical_apicid(vo
     1.4  /* State of each CPU. */
     1.5  DEFINE_PER_CPU(int, cpu_state) = { 0 };
     1.6  
     1.7 -static void *stack_base[NR_CPUS] __cacheline_aligned;
     1.8 +static void *stack_base[NR_CPUS];
     1.9  static DEFINE_SPINLOCK(cpu_add_remove_lock);
    1.10  
    1.11  /*
    1.12 @@ -805,14 +805,6 @@ static inline int alloc_cpu_id(void)
    1.13  	return cpu;
    1.14  }
    1.15  
    1.16 -static struct vcpu *prepare_idle_vcpu(unsigned int cpu)
    1.17 -{
    1.18 -	if (idle_vcpu[cpu])
    1.19 -		return idle_vcpu[cpu];
    1.20 -
    1.21 -	return alloc_idle_vcpu(cpu);
    1.22 -}
    1.23 -
    1.24  static void *prepare_idle_stack(unsigned int cpu)
    1.25  {
    1.26  	if (!stack_base[cpu])
    1.27 @@ -849,7 +841,7 @@ static int __devinit do_boot_cpu(int api
    1.28  
    1.29  	booting_cpu = cpu;
    1.30  
    1.31 -	v = prepare_idle_vcpu(cpu);
    1.32 +	v = alloc_idle_vcpu(cpu);
    1.33  	BUG_ON(v == NULL);
    1.34  
    1.35  	/* start_eip had better be page-aligned! */