1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/apic-xen.c	Wed Feb 15 12:21:12 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/apic-xen.c	Wed Feb 15 14:13:10 2006 +0000
     1.3 @@ -60,11 +60,6 @@ int enable_local_apic __initdata = 0; /*
     1.4   */
     1.5  int apic_verbosity;
     1.6  
     1.7 -int get_physical_broadcast(void)
     1.8 -{
     1.9 -        return 0xff;
    1.10 -}
    1.11 -
    1.12  /*
    1.13   * 'what should we do if we get a hw irq event on an illegal vector'.
    1.14   * each architecture has to answer this themselves.
    1.15 @@ -83,12 +78,19 @@ void ack_bad_irq(unsigned int irq)
    1.16  	ack_APIC_irq();
    1.17  }
    1.18  
    1.19 +int get_physical_broadcast(void)
    1.20 +{
    1.21 +        return 0xff;
    1.22 +}
    1.23 +
    1.24  #ifdef CONFIG_XEN
    1.25  void switch_APIC_timer_to_ipi(void *cpumask) { }
    1.26  EXPORT_SYMBOL(switch_APIC_timer_to_ipi);
    1.27  void switch_ipi_to_APIC_timer(void *cpumask) { }
    1.28  EXPORT_SYMBOL(switch_ipi_to_APIC_timer);
    1.29 -#else
    1.30 +#endif
    1.31 +
    1.32 +#ifndef CONFIG_XEN
    1.33  #ifndef CONFIG_SMP
    1.34  static void up_apic_timer_interrupt_call(struct pt_regs *regs)
    1.35  {
    1.36 @@ -120,12 +122,12 @@ void smp_send_timer_broadcast_ipi(struct
    1.37  #endif
    1.38  	}
    1.39  }
    1.40 +#endif
    1.41  
    1.42  int setup_profiling_timer(unsigned int multiplier)
    1.43  {
    1.44  	return -EINVAL;
    1.45  }
    1.46 -#endif
    1.47  
    1.48  /*
    1.49   * This initializes the IO-APIC and APIC hardware if this is

     2.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/apic-xen.c	Wed Feb 15 12:21:12 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/apic-xen.c	Wed Feb 15 14:13:10 2006 +0000
     2.3 @@ -36,11 +36,19 @@
     2.4  #include <asm/hpet.h>
     2.5  #include <asm/idle.h>
     2.6  
     2.7 -/*
     2.8 - * Debug level
     2.9 - */
    2.10  int apic_verbosity;
    2.11 -int disable_apic;
    2.12 +
    2.13 +#ifdef CONFIG_XEN
    2.14 +void switch_APIC_timer_to_ipi(void *cpumask) { }
    2.15 +EXPORT_SYMBOL(switch_APIC_timer_to_ipi);
    2.16 +void switch_ipi_to_APIC_timer(void *cpumask) { }
    2.17 +EXPORT_SYMBOL(switch_ipi_to_APIC_timer);
    2.18 +#endif
    2.19 +
    2.20 +int setup_profiling_timer(unsigned int multiplier)
    2.21 +{
    2.22 +	return -EINVAL;
    2.23 +}
    2.24  
    2.25  void smp_local_timer_interrupt(struct pt_regs *regs)
    2.26  {
    2.27 @@ -159,17 +167,7 @@ asmlinkage void smp_error_interrupt(void
    2.28  	irq_exit();
    2.29  }
    2.30  
    2.31 -int get_physical_broadcast(void)
    2.32 -{
    2.33 -        return 0xff;
    2.34 -}
    2.35 -
    2.36 -#ifdef CONFIG_XEN
    2.37 -void switch_APIC_timer_to_ipi(void *cpumask) { }
    2.38 -EXPORT_SYMBOL(switch_APIC_timer_to_ipi);
    2.39 -void switch_ipi_to_APIC_timer(void *cpumask) { }
    2.40 -EXPORT_SYMBOL(switch_ipi_to_APIC_timer);
    2.41 -#endif
    2.42 +int disable_apic;
    2.43  
    2.44  /*
    2.45   * This initializes the IO-APIC and APIC hardware if this is

     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c	Wed Feb 15 12:21:12 2006 +0100
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c	Wed Feb 15 14:13:10 2006 +0000
     3.3 @@ -432,11 +432,12 @@ void __init smp_cpus_done(unsigned int m
     3.4  {
     3.5  }
     3.6  
     3.7 +#ifndef CONFIG_X86_LOCAL_APIC
     3.8  int setup_profiling_timer(unsigned int multiplier)
     3.9  {
    3.10 -	/* Dummy function. */
    3.11 -	return 0;
    3.12 +	return -EINVAL;
    3.13  }
    3.14 +#endif
    3.15  
    3.16  /*
    3.17   * Local variables: