a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AMD IOMMU: remove now unnecessary #ifdefs

Browse Source 
The #ifdef's are no longer necessary when the iommu-api and the amd
iommu updates are merged together.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
This commit is contained in:
Joerg Roedel 2009-01-03 14:16:35 +01:00
parent b0a11f44ab
commit 065a6d68c7
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kernel/amd_iommu.c
View File

@ -426,7 +426,6 @@ static void iommu_flush_tlb(struct amd_iommu *iommu, u16 domid)
iommu_queue_inv_iommu_pages(iommu, address, domid, 0, 1); iommu_queue_inv_iommu_pages(iommu, address, domid, 0, 1);
} }
#ifdef CONFIG_IOMMU_API
/* /*
* This function is used to flush the IO/TLB for a given protection domain * This function is used to flush the IO/TLB for a given protection domain
* on every IOMMU in the system * on every IOMMU in the system
@ -450,7 +449,6 @@ static void iommu_flush_domain(u16 domid)
spin_unlock_irqrestore(&iommu->lock, flags); spin_unlock_irqrestore(&iommu->lock, flags);
} }
} }
#endif
/**************************************************************************** /****************************************************************************
* *
@ -516,7 +514,6 @@ static int iommu_map_page(struct protection_domain *dom,
return 0; return 0;
} }
#ifdef CONFIG_IOMMU_API
static void iommu_unmap_page(struct protection_domain *dom, static void iommu_unmap_page(struct protection_domain *dom,
unsigned long bus_addr) unsigned long bus_addr)
{ {
@ -538,7 +535,6 @@ static void iommu_unmap_page(struct protection_domain *dom,
*pte = 0; *pte = 0;
} }
#endif
/* /*
* This function checks if a specific unity mapping entry is needed for * This function checks if a specific unity mapping entry is needed for
@ -723,7 +719,6 @@ static u16 domain_id_alloc(void)
return id; return id;
} }
#ifdef CONFIG_IOMMU_API
static void domain_id_free(int id) static void domain_id_free(int id)
{ {
unsigned long flags; unsigned long flags;
@ -733,7 +728,6 @@ static void domain_id_free(int id)
__clear_bit(id, amd_iommu_pd_alloc_bitmap); __clear_bit(id, amd_iommu_pd_alloc_bitmap);
write_unlock_irqrestore(&amd_iommu_devtable_lock, flags); write_unlock_irqrestore(&amd_iommu_devtable_lock, flags);
} }
#endif
/* /*
* Used to reserve address ranges in the aperture (e.g. for exclusion * Used to reserve address ranges in the aperture (e.g. for exclusion
@ -1702,9 +1696,7 @@ int __init amd_iommu_init_dma_ops(void)
/* Make the driver finally visible to the drivers */ /* Make the driver finally visible to the drivers */
dma_ops = &amd_iommu_dma_ops; dma_ops = &amd_iommu_dma_ops;
#ifdef CONFIG_IOMMU_API
register_iommu(&amd_iommu_ops); register_iommu(&amd_iommu_ops);
#endif
bus_register_notifier(&pci_bus_type, &device_nb); bus_register_notifier(&pci_bus_type, &device_nb);
@ -1732,8 +1724,6 @@ free_domains:
* *
*****************************************************************************/ *****************************************************************************/
#ifdef CONFIG_IOMMU_API
static void cleanup_domain(struct protection_domain *domain) static void cleanup_domain(struct protection_domain *domain)
{ {
unsigned long flags; unsigned long flags;
@ -1944,4 +1934,3 @@ static struct iommu_ops amd_iommu_ops = {
.iova_to_phys = amd_iommu_iova_to_phys, .iova_to_phys = amd_iommu_iova_to_phys,
}; };
#endif