diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2012-05-30 20:19:55 (GMT) |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-06-25 11:48:30 (GMT) |
| commit | 7d43c2e42cb1e436f97c1763150e4e1122ae0d57 (patch) | |
| tree | 6079999184585e6a556f06087aaabc89d1b0939c /arch/ia64 | |
| parent | 783f157bc5a7fa30ee17b4099b27146bd1b68af4 (diff) | |
| download | linux-7d43c2e42cb1e436f97c1763150e4e1122ae0d57.tar.xz | |
iommu: Remove group_mf
The iommu=group_mf is really no longer needed with the addition of ACS
support in IOMMU drivers creating groups. Most multifunction devices
will now be grouped already. If a device has gone to the trouble of
exposing ACS, trust that it works. We can use the device specific ACS
function for fixing devices we trust individually. This largely
reverts bcb71abe.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/iommu.h | 2 | ||||
| -rw-r--r-- | arch/ia64/kernel/pci-dma.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/ia64/include/asm/iommu.h b/arch/ia64/include/asm/iommu.h index b6a809f..105c93b 100644 --- a/arch/ia64/include/asm/iommu.h +++ b/arch/ia64/include/asm/iommu.h @@ -11,12 +11,10 @@ extern void no_iommu_init(void); extern int force_iommu, no_iommu; extern int iommu_pass_through; extern int iommu_detected; -extern int iommu_group_mf; #else #define iommu_pass_through (0) #define no_iommu (1) #define iommu_detected (0) -#define iommu_group_mf (0) #endif extern void iommu_dma_init(void); extern void machvec_init(const char *name); diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c index 7cdc89b..1ddcfe5 100644 --- a/arch/ia64/kernel/pci-dma.c +++ b/arch/ia64/kernel/pci-dma.c @@ -32,7 +32,6 @@ int force_iommu __read_mostly; #endif int iommu_pass_through; -int iommu_group_mf; /* Dummy device used for NULL arguments (normally ISA). Better would be probably a smaller DMA mask, but this is bug-to-bug compatible |