23.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/mpparse.c	Tue Aug 23 08:40:58 2005 +0000
    23.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/mpparse.c	Tue Aug 23 08:41:18 2005 +0000
    23.3 @@ -784,7 +784,9 @@ static int __init smp_scan_config (unsig
    23.4  
    23.5  void __init find_smp_config (void)
    23.6  {
    23.7 +#ifndef CONFIG_XEN
    23.8  	unsigned int address;
    23.9 +#endif
   23.10  
   23.11  	/*
   23.12  	 * FIXME: Linux assumes you have 640K of base ram..

    28.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c	Tue Aug 23 08:40:58 2005 +0000
    28.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c	Tue Aug 23 08:41:18 2005 +0000
    28.3 @@ -1604,6 +1604,9 @@ static void smp_intr_exit(void)
    28.4  	unbind_ipi_from_irq(CALL_FUNCTION_VECTOR);
    28.5  }
    28.6  
    28.7 +extern void local_setup_timer_irq(void);
    28.8 +extern void local_teardown_timer_irq(void);
    28.9 +
   28.10  void smp_suspend(void)
   28.11  {
   28.12  	/* XXX todo: take down time and ipi's on all cpus */

    37.1 --- a/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c	Tue Aug 23 08:40:58 2005 +0000
    37.2 +++ b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c	Tue Aug 23 08:41:18 2005 +0000
    37.3 @@ -435,9 +435,11 @@ void unbind_evtchn_from_irqhandler(unsig
    37.4      unbind_evtchn_from_irq(evtchn);
    37.5  }
    37.6  
    37.7 +#ifdef CONFIG_SMP
    37.8  static void do_nothing_function(void *ign)
    37.9  {
   37.10  }
   37.11 +#endif
   37.12  
   37.13  /* Rebind an evtchn so that it gets delivered to a specific cpu */
   37.14  static void rebind_irq_to_cpu(unsigned irq, unsigned tcpu)

    60.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Tue Aug 23 08:40:58 2005 +0000
    60.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Tue Aug 23 08:41:18 2005 +0000
    60.3 @@ -11,6 +11,8 @@
    60.4   * Copyright (c) 2005, Christopher Clark
    60.5   */
    60.6  
    60.7 +#include <linux/spinlock.h>
    60.8 +#include <asm-xen/balloon.h>
    60.9  #include "common.h"
   60.10  
   60.11  /*