From 3d9c049ac63eca4893b9377f49368740f4550cd3 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Sat, 25 Mar 2006 16:30:43 +0100
Subject: [PATCH] --- yaml --- r: 23824 b: refs/heads/master c:
 3056d6be19b50cbd3f0290e816d702cc3e54a6f3 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86_64/kernel/pci-dma.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f2007c186448..cd27055c6923 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 554d284ba90bc2306c31e5363789f05c320969c3
+refs/heads/master: 3056d6be19b50cbd3f0290e816d702cc3e54a6f3
diff --git a/trunk/arch/x86_64/kernel/pci-dma.c b/trunk/arch/x86_64/kernel/pci-dma.c
index 4ed391edd47a..03c9eeedb0f3 100644
--- a/trunk/arch/x86_64/kernel/pci-dma.c
+++ b/trunk/arch/x86_64/kernel/pci-dma.c
@@ -73,6 +73,9 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
 	if (dma_mask == 0)
 		dma_mask = 0xffffffff;
 
+	/* Don't invoke OOM killer */
+	gfp |= __GFP_NORETRY;
+
 	/* Kludge to make it bug-to-bug compatible with i386. i386
 	   uses the normal dma_mask for alloc_coherent. */
 	dma_mask &= *dev->dma_mask;