[Xen-changelog] [xen-unstable] [IA64] clean warnings

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

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1182534529 21600
# Node ID 8a6a6d4afcb31c24ee87a5d30bebec41e8d38126
# Parent  4d159746d0e6e2bf12c90c9e444104327d195dad
[IA64] clean warnings

This effectively reverts the io_init.c changes from
ia64/xen-unstable.hg cset 15376:39a95178edbf

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

diff -r 4d159746d0e6 -r 8a6a6d4afcb3 xen/arch/ia64/linux-xen/sn/kernel/io_init.c
--- a/xen/arch/ia64/linux-xen/sn/kernel/io_init.c       Fri Jun 22 11:44:44 
2007 -0600
+++ b/xen/arch/ia64/linux-xen/sn/kernel/io_init.c       Fri Jun 22 11:48:49 
2007 -0600
@@ -182,7 +182,6 @@ sn_pcidev_info_get(struct pci_dev *dev)
        }
        return NULL;
 }
-#endif
 
 /* Older PROM flush WAR
  *
@@ -362,7 +361,6 @@ sn_pci_window_fixup(struct pci_dev *dev,
        controller->window = new_window;
 }
 
-#ifndef XEN
 void sn_pci_unfixup_slot(struct pci_dev *dev)
 {
        struct pci_dev *host_pci_dev = SN_PCIDEV_INFO(dev)->host_pci_dev;
@@ -658,7 +656,9 @@ static int __init sn_io_early_init(void)
 static int __init sn_io_early_init(void)
 {
        int i, j;
+#ifndef XEN
        struct pci_dev *pci_dev = NULL;
+#endif
 
        if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
                return 0;

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