ia64/xen-unstable

changeset 7431:aabc33c3c0ac

Fix -xen builds.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue Oct 18 19:28:16 2005 +0100 (2005-10-18)
parents 3233e3921fdd
children 4dd58ef39639
files linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c linux-2.6-xen-sparse/include/asm-xen/asm-i386/smp.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c	Tue Oct 18 19:07:03 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c	Tue Oct 18 19:28:16 2005 +0100
     1.3 @@ -74,10 +74,10 @@ cpumask_t cpu_sibling_map[NR_CPUS] __cac
     1.4  cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned;
     1.5  EXPORT_SYMBOL(cpu_core_map);
     1.6  
     1.7 -#ifdef __i386__
     1.8 +#if defined(__i386__)
     1.9  u8 x86_cpu_to_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = 0xff };
    1.10  EXPORT_SYMBOL(x86_cpu_to_apicid);
    1.11 -#else
    1.12 +#elif !defined(CONFIG_X86_IO_APIC)
    1.13  unsigned int maxcpus = NR_CPUS;
    1.14  #endif
    1.15  
     2.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/smp.h	Tue Oct 18 19:07:03 2005 +0100
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/smp.h	Tue Oct 18 19:28:16 2005 +0100
     2.3 @@ -54,6 +54,7 @@ extern u8 x86_cpu_to_apicid[];
     2.4  #define __smp_processor_id() (current_thread_info()->cpu)
     2.5  
     2.6  extern cpumask_t cpu_possible_map;
     2.7 +#define cpu_callin_map cpu_possible_map
     2.8  
     2.9  /* We don't mark CPUs online until __cpu_up(), so we need another measure */
    2.10  static inline int num_booting_cpus(void)