1.1 --- a/xen/arch/ia64/linux-xen/sn/kernel/io_init.c	Thu Dec 14 13:25:49 2006 -0700
     1.2 +++ b/xen/arch/ia64/linux-xen/sn/kernel/io_init.c	Thu Dec 14 13:29:17 2006 -0700
     1.3 @@ -646,8 +646,10 @@ void sn_bus_free_sysdata(void)
     1.4  
     1.5  static int __init sn_pci_init(void)
     1.6  {
     1.7 +#ifndef XEN
     1.8  	int i, j;
     1.9  	struct pci_dev *pci_dev = NULL;
    1.10 +#endif
    1.11  
    1.12  	if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
    1.13  		return 0;

     2.1 --- a/xen/arch/ia64/linux-xen/sn/kernel/irq.c	Thu Dec 14 13:25:49 2006 -0700
     2.2 +++ b/xen/arch/ia64/linux-xen/sn/kernel/irq.c	Thu Dec 14 13:29:17 2006 -0700
     2.3 @@ -31,8 +31,10 @@
     2.4  #endif
     2.5  
     2.6  static void force_interrupt(int irq);
     2.7 +#ifndef XEN
     2.8  static void register_intr_pda(struct sn_irq_info *sn_irq_info);
     2.9  static void unregister_intr_pda(struct sn_irq_info *sn_irq_info);
    2.10 +#endif
    2.11  
    2.12  int sn_force_interrupt_flag = 1;
    2.13  extern int sn_ioif_inited;
    2.14 @@ -240,10 +242,10 @@ unsigned int sn_local_vector_to_irq(u8 v
    2.15  
    2.16  void sn_irq_init(void)
    2.17  {
    2.18 +#ifndef XEN
    2.19  	int i;
    2.20  	irq_desc_t *base_desc = irq_desc;
    2.21  
    2.22 -#ifndef XEN
    2.23  	ia64_first_device_vector = IA64_SN2_FIRST_DEVICE_VECTOR;
    2.24  	ia64_last_device_vector = IA64_SN2_LAST_DEVICE_VECTOR;
    2.25  
    2.26 @@ -255,6 +257,7 @@ void sn_irq_init(void)
    2.27  #endif
    2.28  }
    2.29  
    2.30 +#ifndef XEN
    2.31  static void register_intr_pda(struct sn_irq_info *sn_irq_info)
    2.32  {
    2.33  	int irq = sn_irq_info->irq_irq;
    2.34 @@ -329,6 +332,7 @@ static void unregister_intr_pda(struct s
    2.35  	spin_unlock(&sn_irq_info_lock);
    2.36  #endif
    2.37  }
    2.38 +#endif /* XEN */
    2.39  
    2.40  #ifndef XEN
    2.41  static void sn_irq_info_free(struct rcu_head *head)
    2.42 @@ -487,10 +491,10 @@ static void sn_check_intr(int irq, struc
    2.43  
    2.44  void sn_lb_int_war_check(void)
    2.45  {
    2.46 +#ifndef XEN
    2.47  	struct sn_irq_info *sn_irq_info;
    2.48  	int i;
    2.49  
    2.50 -#ifndef XEN
    2.51  #ifdef XEN
    2.52  	if (pda->sn_first_irq == 0)
    2.53  #else

     3.1 --- a/xen/arch/ia64/linux-xen/sn/kernel/setup.c	Thu Dec 14 13:25:49 2006 -0700
     3.2 +++ b/xen/arch/ia64/linux-xen/sn/kernel/setup.c	Thu Dec 14 13:29:17 2006 -0700
     3.3 @@ -413,7 +413,11 @@ void __cpuinit sn_cpu_init(void);
     3.4  
     3.5  void __init sn_setup(char **cmdline_p)
     3.6  {
     3.7 +#ifndef XEN
     3.8  	long status, ticks_per_sec, drift;
     3.9 +#else
    3.10 +	unsigned long status, ticks_per_sec, drift;
    3.11 +#endif
    3.12  	u32 version = sn_sal_rev();
    3.13  #ifndef XEN
    3.14  	extern void sn_cpu_init(void);

     4.1 --- a/xen/arch/ia64/linux-xen/sn/kernel/sn2_smp.c	Thu Dec 14 13:25:49 2006 -0700
     4.2 +++ b/xen/arch/ia64/linux-xen/sn/kernel/sn2_smp.c	Thu Dec 14 13:29:17 2006 -0700
     4.3 @@ -157,7 +157,7 @@ void sn_tlb_migrate_finish(struct mm_str
     4.4   */
     4.5  
     4.6  #ifdef XEN  /* Xen is soooooooo stupid! */
     4.7 -static cpumask_t mask_all = CPU_MASK_ALL;
     4.8 +// static cpumask_t mask_all = CPU_MASK_ALL;
     4.9  #endif
    4.10  
    4.11  void
    4.12 @@ -172,7 +172,7 @@ sn2_global_tlb_purge(unsigned long start
    4.13  #ifndef XEN
    4.14  	int mymm = (mm == current->active_mm && mm == current->mm);
    4.15  #else
    4.16 -	struct mm_struct *mm;
    4.17 +	// struct mm_struct *mm;
    4.18  	int mymm = 1;
    4.19  #endif
    4.20  	int use_cpu_ptcga;