aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Capper <steve.capper@linaro.org>2013-07-17 11:38:15 +0100
committerSteve Capper <steve.capper@linaro.org>2013-07-17 13:52:41 +0100
commit546f8ec7a75cf32a6a66fe91cab41bece20e2ea8 (patch)
tree8e868788e20e6e6c1b335bb93b40c26a716dc37d
parent360222d0bd168d5c5b1946c7965babe54f4e54b3 (diff)
downloadlinux-546f8ec7a75cf32a6a66fe91cab41bece20e2ea8.tar.gz
ARM: mm: Remove HugeTLB warning from dma-mapping.chuge-3.11-tidy
The coherant DMA allocator code contained a compile time warning when HugeTLB support was enabled. It stated that huge pages were not supported by the DMA allocator. Apart from memory pressure, HugeTLB should not affect (or be affected by) the higher order pages operated on by the DMA allocator. Also, the user space mappings returned by arm_dma_mmap are done via remap_pfn_range, so the Transparent Huge Page daemon will leave them alone too. This patch removes the huge page warning from dma-mapping.c. Signed-off-by: Steve Capper <steve.capper@linaro.org>
-rw-r--r--arch/arm/mm/dma-mapping.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 7f9b1798c6c..9486048f716 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -249,9 +249,6 @@ static void __dma_free_buffer(struct page *page, size_t size)
}
#ifdef CONFIG_MMU
-#ifdef CONFIG_HUGETLB_PAGE
-#warning ARM Coherent DMA allocator does not (yet) support huge TLB
-#endif
static void *__alloc_from_contiguous(struct device *dev, size_t size,
pgprot_t prot, struct page **ret_page,