diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-10 14:25:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-10 14:25:48 +0100 |
| commit | 9cf7826743e5c78dcfcfdc99d17f79ce6d3a2942 (patch) | |
| tree | 24800686a3015846fa598b52049b25ac233cdcba /arch/x86/kernel/amd_iommu_init.c | |
| parent | 3a0340be06a9356eb61f6804107480acbe62c069 (diff) | |
| parent | 8638c4914f34fedc1c13b1cc13f6d1e5a78c46b4 (diff) | |
| download | talos-op-linux-9cf7826743e5c78dcfcfdc99d17f79ce6d3a2942.tar.gz talos-op-linux-9cf7826743e5c78dcfcfdc99d17f79ce6d3a2942.zip | |
Merge branch 'amd-iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'arch/x86/kernel/amd_iommu_init.c')
| -rw-r--r-- | arch/x86/kernel/amd_iommu_init.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index 7ffc39965233..309a52f96e0b 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c @@ -1274,6 +1274,10 @@ static int __init amd_iommu_init(void) if (ret) goto free; + ret = amd_iommu_init_devices(); + if (ret) + goto free; + if (iommu_pass_through) ret = amd_iommu_init_passthrough(); else @@ -1281,6 +1285,8 @@ static int __init amd_iommu_init(void) if (ret) goto free; + amd_iommu_init_notifier(); + enable_iommus(); if (iommu_pass_through) @@ -1296,6 +1302,9 @@ out: return ret; free: + + amd_iommu_uninit_devices(); + free_pages((unsigned long)amd_iommu_pd_alloc_bitmap, get_order(MAX_DOMAIN_ID/8)); |
