diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:23:26 -0700 |
|---|---|---|
| committer | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:23:26 -0700 |
| commit | cc4bca91e848d9d864d8e1bc7895089df01debf8 (patch) | |
| tree | af3027384fac391e363b04e2982debb5bf92eae9 | |
| parent | e2512d61610eed7deee003d20391b086769d0436 (diff) | |
| download | linux-yinghai-cc4bca91e848d9d864d8e1bc7895089df01debf8.tar.gz | |
IOMMU: Separate free_dmar_iommu from free_iommu
We will need separate two calling later for iommu_remove.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
| -rw-r--r-- | drivers/iommu/dmar.c | 2 | ||||
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index 1053b547a23ffe..37409dde683a69 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -851,8 +851,6 @@ void free_iommu(struct intel_iommu *iommu) if (!iommu) return; - free_dmar_iommu(iommu); - if (iommu->reg) unmap_iommu(iommu); diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index db6a562b66af18..a869cfc99782f1 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -2623,6 +2623,7 @@ error: if (drhd->ignored) continue; iommu = drhd->iommu; + free_dmar_iommu(iommu); free_iommu(iommu); } kfree(g_iommus); |