diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:14:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:14:54 +1100 |
| commit | 1d439a496810c6021171f9ee438585e7d4d33079 (patch) | |
| tree | 102d65910358afe3f8c109806097df11faa63248 /drivers | |
| parent | aced1bcac3b3f187255f7436b72209cbf2e8d5fc (diff) | |
| parent | 7a6610139a1e1d9297dd1c5d178022eac36839cb (diff) | |
Merge remote-tracking branch 'dwmw2-iommu/master'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/intel-iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index 4789f8e8bf7a..35463ddf10a1 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c @@ -3627,9 +3627,9 @@ static int intel_iommu_attach_device(struct iommu_domain *domain, pte = dmar_domain->pgd; if (dma_pte_present(pte)) { - free_pgtable_page(dmar_domain->pgd); dmar_domain->pgd = (struct dma_pte *) phys_to_virt(dma_pte_addr(pte)); + free_pgtable_page(pte); } dmar_domain->agaw--; } |