Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / iommu / amd_iommu_init.c

diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 62a4d5c..b7d1cdd 100644 (file)
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -1396,6 +1396,7 @@ static struct syscore_ops amd_iommu_syscore_ops = {
  */
 static int __init amd_iommu_init(void)
 {
+       struct amd_iommu *iommu;
        int i, ret = 0;
 
        /*
@@ -1444,9 +1445,6 @@ static int __init amd_iommu_init(void)
        if (amd_iommu_pd_alloc_bitmap == NULL)
                goto free;
 
-       /* init the device table */
-       init_device_table();
-
        /*
         * let all alias entries point to itself
         */
@@ -1496,6 +1494,12 @@ static int __init amd_iommu_init(void)
        if (ret)
                goto free_disable;
 
+       /* init the device table */
+       init_device_table();
+
+       for_each_iommu(iommu)
+               iommu_flush_all_caches(iommu);
+
        amd_iommu_init_api();
 
        amd_iommu_init_notifier();