diff options
author | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:37 -0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:37 -0700 |
commit | e55574f93ecb78dac5a15f29d18f2ab4dbc813bc (patch) | |
tree | ffce30ba6d6a11b3fdc5ebd28e5f3cca2d87d12c /drivers/iommu/amd_iommu.c | |
parent | 9ea00e4fa07ce46ab79c92087c72ae100de4de42 (diff) | |
parent | d831fd1b46d04e5c8c8a0431c321578d25852695 (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rtlsk-v3.10-rt-14.09
Diffstat (limited to 'drivers/iommu/amd_iommu.c')
-rw-r--r-- | drivers/iommu/amd_iommu.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 6f849cbcac6f..dfb401cba733 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -3187,14 +3187,16 @@ free_domains: static void cleanup_domain(struct protection_domain *domain) { - struct iommu_dev_data *dev_data, *next; + struct iommu_dev_data *entry; unsigned long flags; write_lock_irqsave(&amd_iommu_devtable_lock, flags); - list_for_each_entry_safe(dev_data, next, &domain->dev_list, list) { - __detach_device(dev_data); - atomic_set(&dev_data->bind, 0); + while (!list_empty(&domain->dev_list)) { + entry = list_first_entry(&domain->dev_list, + struct iommu_dev_data, list); + __detach_device(entry); + atomic_set(&entry->bind, 0); } write_unlock_irqrestore(&amd_iommu_devtable_lock, flags); |