mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
x86: remove ifdef CONFIG_CALGARY_IOMMU in pci-dma.c
asm-x86/calgary.h has dummy calgary_iommu_init() and detect_calgary() in !CONFIG_CALGARY_IOMMU case. So we don't need ifdef CONFIG_CALGARY_IOMMU in pci-dma.c. Signed-off-by: FUJITA Tomonori <[email protected]> Acked-by: Muli Ben-Yehuda <[email protected]> Cc: Alexis Bruemmer <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
parent
ac7ded2adb
commit
b8b48326f3
1 changed files with 0 additions and 4 deletions
|
|
@ -116,9 +116,7 @@ void __init pci_iommu_alloc(void)
|
|||
*/
|
||||
gart_iommu_hole_init();
|
||||
|
||||
#ifdef CONFIG_CALGARY_IOMMU
|
||||
detect_calgary();
|
||||
#endif
|
||||
|
||||
detect_intel_iommu();
|
||||
|
||||
|
|
@ -496,9 +494,7 @@ EXPORT_SYMBOL(dma_free_coherent);
|
|||
|
||||
static int __init pci_iommu_init(void)
|
||||
{
|
||||
#ifdef CONFIG_CALGARY_IOMMU
|
||||
calgary_iommu_init();
|
||||
#endif
|
||||
|
||||
intel_iommu_init();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue