1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/mpparse.c	Mon Aug 22 21:54:28 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/mpparse.c	Mon Aug 22 23:07:37 2005 +0000
     1.3 @@ -784,7 +784,9 @@ static int __init smp_scan_config (unsig
     1.4  
     1.5  void __init find_smp_config (void)
     1.6  {
     1.7 +#ifndef CONFIG_XEN
     1.8  	unsigned int address;
     1.9 +#endif
    1.10  
    1.11  	/*
    1.12  	 * FIXME: Linux assumes you have 640K of base ram..

     2.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c	Mon Aug 22 21:54:28 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c	Mon Aug 22 23:07:37 2005 +0000
     2.3 @@ -1604,6 +1604,9 @@ static void smp_intr_exit(void)
     2.4  	unbind_ipi_from_irq(CALL_FUNCTION_VECTOR);
     2.5  }
     2.6  
     2.7 +extern void local_setup_timer_irq(void);
     2.8 +extern void local_teardown_timer_irq(void);
     2.9 +
    2.10  void smp_suspend(void)
    2.11  {
    2.12  	/* XXX todo: take down time and ipi's on all cpus */

     3.1 --- a/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c	Mon Aug 22 21:54:28 2005 +0000
     3.2 +++ b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c	Mon Aug 22 23:07:37 2005 +0000
     3.3 @@ -435,9 +435,11 @@ void unbind_evtchn_from_irqhandler(unsig
     3.4      unbind_evtchn_from_irq(evtchn);
     3.5  }
     3.6  
     3.7 +#ifdef CONFIG_SMP
     3.8  static void do_nothing_function(void *ign)
     3.9  {
    3.10  }
    3.11 +#endif
    3.12  
    3.13  /* Rebind an evtchn so that it gets delivered to a specific cpu */
    3.14  static void rebind_irq_to_cpu(unsigned irq, unsigned tcpu)

     4.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Mon Aug 22 21:54:28 2005 +0000
     4.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Mon Aug 22 23:07:37 2005 +0000
     4.3 @@ -11,6 +11,8 @@
     4.4   * Copyright (c) 2005, Christopher Clark
     4.5   */
     4.6  
     4.7 +#include <linux/spinlock.h>
     4.8 +#include <asm-xen/balloon.h>
     4.9  #include "common.h"
    4.10  
    4.11  /*