merge with linux-2.6.18-xen.hg

diff --cc drivers/xen/core/pci.c
index 6bdfd3e6ad7cccf9ad9f1c3e6c5e85caf935782b,6bdfd3e6ad7cccf9ad9f1c3e6c5e85caf935782b..2710c184c9f4823b9bff7cbb73d503bb74d97dda
--- 1/drivers/xen/core/pci.c
--- 2/drivers/xen/core/pci.c
+++ b/drivers/xen/core/pci.c
@@@ -23,13 -23,13 +23,9 @@@ static int pci_bus_probe_wrapper(struc
                return r;
  
        r = pci_bus_probe(dev);
--      if (r) {
--              int ret;
--
--              ret = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_remove,
--                                          &manage_pci);
--              WARN_ON(ret && ret != -ENOSYS);
--      }
++      if (r)
++              WARN_ON(HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_remove,
++                                            &manage_pci));
  
        return r;
  }