diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2014-04-28 10:31:04 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2014-04-28 10:31:04 +0100 |
| commit | 67dadcb324c2fe059cb2c35f8b80df42bb23f7c4 (patch) | |
| tree | 3521a2a9e05a7de426ab50bc7685489ad6340e54 /arch/arm/mm/dma-mapping.c | |
| parent | eb47f71200b7d5b4c8c1f8c75675f592d855aafd (diff) | |
| parent | e26a9e00afc482b971afcaef1db8c9034d4d6d7c (diff) | |
| download | linux-67dadcb324c2fe059cb2c35f8b80df42bb23f7c4.tar.bz2 | |
Merge commit 'e26a9e0' into stable/for-linus-3.15
Diffstat (limited to 'arch/arm/mm/dma-mapping.c')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 11b3914660d2..c9c6acdf90cc 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -284,9 +284,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, |