diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-04-08 13:20:55 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 19:19:57 +0200 |
| commit | 8e0c379718ef32967deea55937895bfc9b493dd8 (patch) | |
| tree | 4176210a3359f4d7421a8b7e0cec29e848e8d68a /arch/x86/kernel/pci-dma_32.c | |
| parent | bca5c09663030bdd18ab1b3ccb6671f663c3345a (diff) | |
| download | op-kernel-dev-8e0c379718ef32967deea55937895bfc9b493dd8.zip op-kernel-dev-8e0c379718ef32967deea55937895bfc9b493dd8.tar.gz | |
x86: merge dma_supported
The code for both arches are very similar, so this patch merge them.
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 | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/x86/kernel/pci-dma_32.c b/arch/x86/kernel/pci-dma_32.c index 6543bb3..1d4091a 100644 --- a/arch/x86/kernel/pci-dma_32.c +++ b/arch/x86/kernel/pci-dma_32.c @@ -155,30 +155,6 @@ void *dma_mark_declared_memory_occupied(struct device *dev, EXPORT_SYMBOL(dma_mark_declared_memory_occupied); #ifdef CONFIG_PCI -/* Many VIA bridges seem to corrupt data for DAC. Disable it here */ - -int -dma_supported(struct device *dev, u64 mask) -{ - /* - * we fall back to GFP_DMA when the mask isn't all 1s, - * so we can't guarantee allocations that must be - * within a tighter range than GFP_DMA.. - */ - if (mask < 0x00ffffff) - return 0; - - /* Work around chipset bugs */ - if (forbid_dac > 0 && mask > 0xffffffffULL) - return 0; - - if (dma_ops->dma_supported) - return dma_ops->dma_supported(dev, mask); - - return 1; -} -EXPORT_SYMBOL(dma_supported); - static int check_iommu(char *s) { if (!strcmp(s, "usedac")) { |
