[Xen-changelog] [xen-unstable] [IA64] SN2 warning fixes

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxxx
# Date 1166128157 25200
# Node ID 5a68672cee38a3ee15e34fcd3a5f91224a81bea2
# Parent  8a9b1b72af445224d3997e4e98a915ded13eae69
[IA64] SN2 warning fixes

Mainly unused variable removal

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
 xen/arch/ia64/linux-xen/sn/kernel/io_init.c |    2 ++
 xen/arch/ia64/linux-xen/sn/kernel/irq.c     |    8 ++++++--
 xen/arch/ia64/linux-xen/sn/kernel/setup.c   |    4 ++++
 xen/arch/ia64/linux-xen/sn/kernel/sn2_smp.c |    4 ++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff -r 8a9b1b72af44 -r 5a68672cee38 xen/arch/ia64/linux-xen/sn/kernel/io_init.c
--- a/xen/arch/ia64/linux-xen/sn/kernel/io_init.c       Thu Dec 14 13:25:49 
2006 -0700
+++ b/xen/arch/ia64/linux-xen/sn/kernel/io_init.c       Thu Dec 14 13:29:17 
2006 -0700
@@ -646,8 +646,10 @@ void sn_bus_free_sysdata(void)
 
 static int __init sn_pci_init(void)
 {
+#ifndef XEN
        int i, j;
        struct pci_dev *pci_dev = NULL;
+#endif
 
        if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
                return 0;
diff -r 8a9b1b72af44 -r 5a68672cee38 xen/arch/ia64/linux-xen/sn/kernel/irq.c
--- a/xen/arch/ia64/linux-xen/sn/kernel/irq.c   Thu Dec 14 13:25:49 2006 -0700
+++ b/xen/arch/ia64/linux-xen/sn/kernel/irq.c   Thu Dec 14 13:29:17 2006 -0700
@@ -31,8 +31,10 @@
 #endif
 
 static void force_interrupt(int irq);
+#ifndef XEN
 static void register_intr_pda(struct sn_irq_info *sn_irq_info);
 static void unregister_intr_pda(struct sn_irq_info *sn_irq_info);
+#endif
 
 int sn_force_interrupt_flag = 1;
 extern int sn_ioif_inited;
@@ -240,10 +242,10 @@ unsigned int sn_local_vector_to_irq(u8 v
 
 void sn_irq_init(void)
 {
+#ifndef XEN
        int i;
        irq_desc_t *base_desc = irq_desc;
 
-#ifndef XEN
        ia64_first_device_vector = IA64_SN2_FIRST_DEVICE_VECTOR;
        ia64_last_device_vector = IA64_SN2_LAST_DEVICE_VECTOR;
 
@@ -255,6 +257,7 @@ void sn_irq_init(void)
 #endif
 }
 
+#ifndef XEN
 static void register_intr_pda(struct sn_irq_info *sn_irq_info)
 {
        int irq = sn_irq_info->irq_irq;
@@ -329,6 +332,7 @@ static void unregister_intr_pda(struct s
        spin_unlock(&sn_irq_info_lock);
 #endif
 }
+#endif /* XEN */
 
 #ifndef XEN
 static void sn_irq_info_free(struct rcu_head *head)
@@ -487,10 +491,10 @@ static void sn_check_intr(int irq, struc
 
 void sn_lb_int_war_check(void)
 {
+#ifndef XEN
        struct sn_irq_info *sn_irq_info;
        int i;
 
-#ifndef XEN
 #ifdef XEN
        if (pda->sn_first_irq == 0)
 #else
diff -r 8a9b1b72af44 -r 5a68672cee38 xen/arch/ia64/linux-xen/sn/kernel/setup.c
--- a/xen/arch/ia64/linux-xen/sn/kernel/setup.c Thu Dec 14 13:25:49 2006 -0700
+++ b/xen/arch/ia64/linux-xen/sn/kernel/setup.c Thu Dec 14 13:29:17 2006 -0700
@@ -413,7 +413,11 @@ void __cpuinit sn_cpu_init(void);
 
 void __init sn_setup(char **cmdline_p)
 {
+#ifndef XEN
        long status, ticks_per_sec, drift;
+#else
+       unsigned long status, ticks_per_sec, drift;
+#endif
        u32 version = sn_sal_rev();
 #ifndef XEN
        extern void sn_cpu_init(void);
diff -r 8a9b1b72af44 -r 5a68672cee38 xen/arch/ia64/linux-xen/sn/kernel/sn2_smp.c
--- a/xen/arch/ia64/linux-xen/sn/kernel/sn2_smp.c       Thu Dec 14 13:25:49 
2006 -0700
+++ b/xen/arch/ia64/linux-xen/sn/kernel/sn2_smp.c       Thu Dec 14 13:29:17 
2006 -0700
@@ -157,7 +157,7 @@ void sn_tlb_migrate_finish(struct mm_str
  */
 
 #ifdef XEN  /* Xen is soooooooo stupid! */
-static cpumask_t mask_all = CPU_MASK_ALL;
+// static cpumask_t mask_all = CPU_MASK_ALL;
 #endif
 
 void
@@ -172,7 +172,7 @@ sn2_global_tlb_purge(unsigned long start
 #ifndef XEN
        int mymm = (mm == current->active_mm && mm == current->mm);
 #else
-       struct mm_struct *mm;
+       // struct mm_struct *mm;
        int mymm = 1;
 #endif
        int use_cpu_ptcga;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog