From: David Daney Date: Fri, 1 Oct 2010 20:27:28 +0000 (-0700) Subject: MIPS: Allow MAX_DMA32_PFN to be overridden. X-Git-Tag: v2.6.37-rc1~38^2~39 X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=cfd570990f863de90a86da73ef7b7d84e5190647;p=net-next-2.6.git MIPS: Allow MAX_DMA32_PFN to be overridden. DMA mapping may reduce the usable physical address range usable for 32-bit DMA. Signed-off-by: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1633/ Signed-off-by: Ralf Baechle --- diff --git a/arch/mips/include/asm/dma.h b/arch/mips/include/asm/dma.h index 1353c81065d..2d47da62d5a 100644 --- a/arch/mips/include/asm/dma.h +++ b/arch/mips/include/asm/dma.h @@ -91,7 +91,10 @@ #define MAX_DMA_ADDRESS (PAGE_OFFSET + 0x01000000) #endif #define MAX_DMA_PFN PFN_DOWN(virt_to_phys((void *)MAX_DMA_ADDRESS)) + +#ifndef MAX_DMA32_PFN #define MAX_DMA32_PFN (1UL << (32 - PAGE_SHIFT)) +#endif /* 8237 DMA controllers */ #define IO_DMA1_BASE 0x00 /* 8 bit slave DMA, channels 0..3 */