1.1 --- a/xen/arch/ia64/linux-xen/smp.c	Thu Mar 30 12:41:48 2006 -0700
     1.2 +++ b/xen/arch/ia64/linux-xen/smp.c	Thu Mar 30 12:47:45 2006 -0700
     1.3 @@ -47,8 +47,8 @@
     1.4  #include <asm/tlbflush.h>
     1.5  #include <asm/unistd.h>
     1.6  #include <asm/mca.h>
     1.7 +#ifdef XEN
     1.8  #include <asm/vhpt.h>
     1.9 -#ifdef XEN
    1.10  #include <asm/hw_irq.h>
    1.11  #endif
    1.12  
    1.13 @@ -291,11 +291,14 @@ smp_flush_tlb_all (void)
    1.14  {
    1.15  	on_each_cpu((void (*)(void *))local_flush_tlb_all, NULL, 1, 1);
    1.16  }
    1.17 +
    1.18 +#ifdef XEN
    1.19  void
    1.20  smp_vhpt_flush_all(void)
    1.21  {
    1.22 -    on_each_cpu((void (*)(void *))vhpt_flush, NULL, 1, 1);
    1.23 +	on_each_cpu((void (*)(void *))vhpt_flush, NULL, 1, 1);
    1.24  }
    1.25 +#endif
    1.26  
    1.27  #ifndef XEN
    1.28  void

     2.1 --- a/xen/include/asm-ia64/vhpt.h	Thu Mar 30 12:41:48 2006 -0700
     2.2 +++ b/xen/include/asm-ia64/vhpt.h	Thu Mar 30 12:47:45 2006 -0700
     2.3 @@ -20,7 +20,7 @@
     2.4  #ifdef CONFIG_SMP
     2.5  # define vhpt_flush_all()	smp_vhpt_flush_all()
     2.6  #else
     2.7 -# define vhpt_flush_all()   vhpt_flush()
     2.8 +# define vhpt_flush_all()	vhpt_flush()
     2.9  #endif
    2.10  // FIXME: These should be automatically generated
    2.11