xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'amd-iommu/passthrough' into amd-iommu/2.6.32

Browse Source 
Conflicts:
	arch/x86/kernel/amd_iommu.c
	arch/x86/kernel/amd_iommu_init.c
This commit is contained in:
Joerg Roedel
2009-09-03 16:34:23 +02:00
parent 85da07c409 4751a95134
commit 03362a05c5
5 changed files with 143 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kernel/amd_iommu_init.c
View File

@@ -1252,12 +1252,18 @@ int __init amd_iommu_init(void)
if (ret)
goto free;
ret = amd_iommu_init_dma_ops();
if (iommu_pass_through)
ret = amd_iommu_init_passthrough();
else
ret = amd_iommu_init_dma_ops();
if (ret)
goto free;
enable_iommus();
if (iommu_pass_through)
goto out;
printk(KERN_INFO "AMD-Vi: device isolation ");
if (amd_iommu_isolate)
printk("enabled\n");