summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-04-15 11:08:07 +0200
committerChristoph Hellwig <hch@lst.de>2018-04-23 14:43:27 +0200
commit504a918e6714b551b7b39940dbab32610fafa1fe (patch)
tree1354fe047d8f5bd3f27f1567683e94de8252c691 /lib
parent6d08b06e67cd117f6992c46611dfb4ce267cd71e (diff)
downloadlinux-stable-504a918e6714b551b7b39940dbab32610fafa1fe.tar.gz
linux-stable-504a918e6714b551b7b39940dbab32610fafa1fe.tar.bz2
linux-stable-504a918e6714b551b7b39940dbab32610fafa1fe.zip
dma-direct: don't retry allocation for no-op GFP_DMA
When an allocation with lower dma_coherent mask fails, dma_direct_alloc() retries the allocation with GFP_DMA. But, this is useless for architectures that hav no ZONE_DMA. Fix it by adding the check of CONFIG_ZONE_DMA before retrying the allocation. Fixes: 95f183916d4b ("dma-direct: retry allocations using GFP_DMA for small masks") Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/dma-direct.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/dma-direct.c b/lib/dma-direct.c
index c0bba30fef0a..bbfb229aa067 100644
--- a/lib/dma-direct.c
+++ b/lib/dma-direct.c
@@ -84,7 +84,8 @@ again:
__free_pages(page, page_order);
page = NULL;
- if (dev->coherent_dma_mask < DMA_BIT_MASK(32) &&
+ if (IS_ENABLED(CONFIG_ZONE_DMA) &&
+ dev->coherent_dma_mask < DMA_BIT_MASK(32) &&
!(gfp & GFP_DMA)) {
gfp = (gfp & ~GFP_DMA32) | GFP_DMA;
goto again;