diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-04-08 13:20:56 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 19:19:57 +0200 |
| commit | fae9a0d8ca68a14da8d2351ad3e0bf42f3b29899 (patch) | |
| tree | a16bbeabb8b77e96e040ddc900a03ae5879fe784 /arch/x86/kernel/pci-dma_32.c | |
| parent | 8e0c379718ef32967deea55937895bfc9b493dd8 (diff) | |
x86: merge iommu initialization parameters
we merge the iommu initialization parameters in pci-dma.c
Nice thing, that both architectures at least recognize the same
parameters.
usedac i386 parameter is marked for deprecation
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/pci-dma_32.c')
| -rw-r--r-- | arch/x86/kernel/pci-dma_32.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/x86/kernel/pci-dma_32.c b/arch/x86/kernel/pci-dma_32.c index 1d4091af441..eea52df68a3 100644 --- a/arch/x86/kernel/pci-dma_32.c +++ b/arch/x86/kernel/pci-dma_32.c @@ -153,15 +153,3 @@ void *dma_mark_declared_memory_occupied(struct device *dev, return mem->virt_base + (pos << PAGE_SHIFT); } EXPORT_SYMBOL(dma_mark_declared_memory_occupied); - -#ifdef CONFIG_PCI -static int check_iommu(char *s) -{ - if (!strcmp(s, "usedac")) { - forbid_dac = -1; - return 1; - } - return 0; -} -__setup("iommu=", check_iommu); -#endif |