From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Thu, 7 Aug 2008 02:58:10 +0000 (+0900)
Subject: merge with linux-2.6.18-xen.hg
X-Git-Tag: qparent~27
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d6ceba1a857e9b9e38a92cd190de53c84996432f;p=xenclient%2Fkernel.git

merge with linux-2.6.18-xen.hg
---

d6ceba1a857e9b9e38a92cd190de53c84996432f
diff --cc drivers/xen/core/pci.c
index 6bdfd3e6,6bdfd3e6..2710c184
--- a/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;
  }