ia64/xen-unstable

changeset 4855:b5334eb38828

bitkeeper revision 1.1389.15.16 (428243f7AUGUUcGs4LGHbUO4lUoHyw)

smpboot_hooks.h, smpboot.c:
Fix domU build after ACPI changes.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Wed May 11 17:42:15 2005 +0000 (2005-05-11)
parents 2c883d988a41
children 4f406bfbf32e
files linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c	Wed May 11 17:37:59 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c	Wed May 11 17:42:15 2005 +0000
     1.3 @@ -54,7 +54,9 @@
     1.4  #include <asm/desc.h>
     1.5  #include <asm/arch_hooks.h>
     1.6  
     1.7 -#include <mach_apic.h>
     1.8 +#ifndef CONFIG_X86_IO_APIC
     1.9 +#define Dprintk(args...)
    1.10 +#endif
    1.11  #include <mach_wakecpu.h>
    1.12  #include <smpboot_hooks.h>
    1.13  
    1.14 @@ -1096,6 +1098,7 @@ static void __init smp_boot_cpus(unsigne
    1.15  	cpus_clear(cpu_sibling_map[0]);
    1.16  	cpu_set(0, cpu_sibling_map[0]);
    1.17  
    1.18 +#ifdef CONFIG_X86_IO_APIC
    1.19  	/*
    1.20  	 * If we couldn't find an SMP configuration at boot time,
    1.21  	 * get out of here now!
    1.22 @@ -1106,12 +1109,15 @@ static void __init smp_boot_cpus(unsigne
    1.23  #if 0
    1.24  		phys_cpu_present_map = physid_mask_of_physid(0);
    1.25  #endif
    1.26 +#ifdef CONFIG_X86_LOCAL_APIC
    1.27  		if (APIC_init_uniprocessor())
    1.28  			printk(KERN_NOTICE "Local APIC not detected."
    1.29  					   " Using dummy APIC emulation.\n");
    1.30 +#endif
    1.31  		map_cpu_to_logical_apicid();
    1.32  		return;
    1.33  	}
    1.34 +#endif
    1.35  
    1.36  #if 0
    1.37  	/*
     2.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h	Wed May 11 17:37:59 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h	Wed May 11 17:42:15 2005 +0000
     2.3 @@ -3,7 +3,9 @@
     2.4  
     2.5  static inline void smpboot_clear_io_apic_irqs(void)
     2.6  {
     2.7 +#ifdef CONFIG_X86_IO_APIC
     2.8  	io_apic_irqs = 0;
     2.9 +#endif
    2.10  }
    2.11  
    2.12  static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)
    2.13 @@ -39,12 +41,14 @@ static inline void smpboot_restore_warm_
    2.14  
    2.15  static inline void smpboot_setup_io_apic(void)
    2.16  {
    2.17 +#ifdef CONFIG_X86_IO_APIC
    2.18  	/*
    2.19  	 * Here we can be sure that there is an IO-APIC in the system. Let's
    2.20  	 * go and set it up:
    2.21  	 */
    2.22  	if (!skip_ioapic_setup && nr_ioapics)
    2.23  		setup_IO_APIC();
    2.24 +#endif
    2.25  }
    2.26  
    2.27  
     3.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h	Wed May 11 17:37:59 2005 +0000
     3.2 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h	Wed May 11 17:42:15 2005 +0000
     3.3 @@ -3,7 +3,9 @@
     3.4  
     3.5  static inline void smpboot_clear_io_apic_irqs(void)
     3.6  {
     3.7 +#ifdef CONFIG_X86_IO_APIC
     3.8  	io_apic_irqs = 0;
     3.9 +#endif
    3.10  }
    3.11  
    3.12  static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)
    3.13 @@ -39,12 +41,14 @@ static inline void smpboot_restore_warm_
    3.14  
    3.15  static inline void smpboot_setup_io_apic(void)
    3.16  {
    3.17 +#ifdef CONFIG_X86_IO_APIC
    3.18  	/*
    3.19  	 * Here we can be sure that there is an IO-APIC in the system. Let's
    3.20  	 * go and set it up:
    3.21  	 */
    3.22  	if (!skip_ioapic_setup && nr_ioapics)
    3.23  		setup_IO_APIC();
    3.24 +#endif
    3.25  }
    3.26  
    3.27