From: Dave Airlie <airlied@redhat.com>
Date: Tue, 15 Jun 2010 01:02:05 +0000 (+1000)
Subject: agp: add no warn since we have a fallback to vmalloc paths
X-Git-Tag: v2.6.35-rc4~15^2~23
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=1c48bc5f71cd7783e19fb8d9462be53f829be177;p=net-next-2.6.git

agp: add no warn since we have a fallback to vmalloc paths

also drop the NORETRY we can probably nearly always satisfy order 1 allocs now,
and again the vmalloc path is there.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 4e414417730..d2abf514398 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -99,7 +99,7 @@ void agp_alloc_page_array(size_t size, struct agp_memory *mem)
 	mem->pages = NULL;
 
 	if (size <= 2*PAGE_SIZE)
-		mem->pages = kmalloc(size, GFP_KERNEL | __GFP_NORETRY);
+		mem->pages = kmalloc(size, GFP_KERNEL | __GFP_NOWARN);
 	if (mem->pages == NULL) {
 		mem->pages = vmalloc(size);
 	}