Commit-ID: 71ff3bca2f70264effe8cbbdd5bc10cf6be5f2f0 Gitweb: http://git.kernel.org/tip/71ff3bca2f70264effe8cbbdd5bc10cf6be5f2f0 Author: Joerg Roedel <joerg.roedel@xxxxxxx> AuthorDate: Mon, 8 Jun 2009 13:47:33 -0700 Committer: Joerg Roedel <joerg.roedel@xxxxxxx> CommitDate: Tue, 9 Jun 2009 11:14:14 +0200 amd-iommu: detach device explicitly before attaching it to a new domain This fixes a bug with a device that could not be assigned to a KVM guest because it is still assigned to a dma_ops protection domain. [chrisw: simply remove WARN_ON(), will always fire since dev->driver will be pci-sub] Signed-off-by: Chris Wright <chrisw@xxxxxxxxxxxx> Signed-off-by: Joerg Roedel <joerg.roedel@xxxxxxx> --- arch/x86/kernel/amd_iommu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index 8187260..772e910 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c @@ -2073,7 +2073,7 @@ static int amd_iommu_attach_device(struct iommu_domain *dom, old_domain = domain_for_device(devid); if (old_domain) - return -EBUSY; + detach_device(old_domain, devid); attach_device(iommu, domain, devid); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|