aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/intel-iommu.c
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2009-07-08 10:23:30 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-07-15 03:17:02 -0400
commit3d39cecc4841e8d4c4abdb401d10180f5faaded0 (patch)
tree8aa51bc0e644752384c2734ecc25ea851dc919f7 /drivers/pci/intel-iommu.c
parent147202aa772329a02c6e80bc2b7a6b8dd3deac0b (diff)
intel-iommu: Remove superfluous iova_alloc_lock from IOVA code
We only ever obtain this lock immediately before the iova_rbtree_lock, and release it immediately after the iova_rbtree_lock. So ditch it and just use iova_rbtree_lock. [v2: Remove the lockdep bits this time too] Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/pci/intel-iommu.c')
-rw-r--r--drivers/pci/intel-iommu.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index c5f7c73cbb55..d6a857397ec3 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -1309,7 +1309,6 @@ static void iommu_detach_domain(struct dmar_domain *domain,
1309} 1309}
1310 1310
1311static struct iova_domain reserved_iova_list; 1311static struct iova_domain reserved_iova_list;
1312static struct lock_class_key reserved_alloc_key;
1313static struct lock_class_key reserved_rbtree_key; 1312static struct lock_class_key reserved_rbtree_key;
1314 1313
1315static void dmar_init_reserved_ranges(void) 1314static void dmar_init_reserved_ranges(void)
@@ -1320,8 +1319,6 @@ static void dmar_init_reserved_ranges(void)
1320 1319
1321 init_iova_domain(&reserved_iova_list, DMA_32BIT_PFN); 1320 init_iova_domain(&reserved_iova_list, DMA_32BIT_PFN);
1322 1321
1323 lockdep_set_class(&reserved_iova_list.iova_alloc_lock,
1324 &reserved_alloc_key);
1325 lockdep_set_class(&reserved_iova_list.iova_rbtree_lock, 1322 lockdep_set_class(&reserved_iova_list.iova_rbtree_lock,
1326 &reserved_rbtree_key); 1323 &reserved_rbtree_key);
1327 1324