[PATCH] x86: use __GFP_NORETRY in the case of GFP_DMA with pci-nommu

[FUJITA Tomonori]

Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
---
 arch/x86/kernel/pci-nommu.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c
index 526b2db..3495f88 100644
--- a/arch/x86/kernel/pci-nommu.c
+++ b/arch/x86/kernel/pci-nommu.c
@@ -102,6 +102,9 @@ nommu_alloc_coherent(struct device *hwdev, size_t size,
 	if (dma_mask == DMA_24BIT_MASK)
 		gfp |= GFP_DMA;
 again:
+	if (gfp & GFP_DMA)
+		gfp |= __GFP_NORETRY;
+
 	page = alloc_pages_node(node, gfp, get_order(size));
 	if (!page)
 		return NULL;
-- 
1.5.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/