diff options
| author | Todd Poynor <toddpoynor@google.com> | 2013-03-13 17:35:08 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2013-03-13 17:35:08 -0700 |
| commit | 1249d25539343d1a7fe361c8d40be7a5df5b0216 (patch) | |
| tree | 770c9a33604bb00c62f44d780aefab27e4eb9379 /arch/x86/kernel/amd_iommu_init.c | |
| parent | 4aad13d07babf68c1d0d37ff1e5f797573c4fd2a (diff) | |
| parent | 0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f (diff) | |
| download | kernel_samsung_tuna-1249d25539343d1a7fe361c8d40be7a5df5b0216.zip kernel_samsung_tuna-1249d25539343d1a7fe361c8d40be7a5df5b0216.tar.gz kernel_samsung_tuna-1249d25539343d1a7fe361c8d40be7a5df5b0216.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Diffstat (limited to 'arch/x86/kernel/amd_iommu_init.c')
| -rw-r--r-- | arch/x86/kernel/amd_iommu_init.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index 33df6e8..d86aa3f 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c @@ -1363,6 +1363,7 @@ static struct syscore_ops amd_iommu_syscore_ops = { */ static int __init amd_iommu_init(void) { + struct amd_iommu *iommu; int i, ret = 0; /* @@ -1411,9 +1412,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 */ @@ -1463,6 +1461,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(); |