From 2fda6bbdf6d3e34948fc22a65712f900109ea9d6 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 15 Jun 2010 11:02:05 +1000
Subject: [PATCH] --- yaml --- r: 200713 b: refs/heads/master c:
 1c48bc5f71cd7783e19fb8d9462be53f829be177 h: refs/heads/master i:   200711:
 c0255b17cc6d6b1d1176a686a69c1877303a527c v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/char/agp/generic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fbea1523dd12..c7e7f7bb7151 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da931a931da85218add949266238c54b5fecd37f
+refs/heads/master: 1c48bc5f71cd7783e19fb8d9462be53f829be177
diff --git a/trunk/drivers/char/agp/generic.c b/trunk/drivers/char/agp/generic.c
index 4e414417730b..d2abf5143983 100644
--- a/trunk/drivers/char/agp/generic.c
+++ b/trunk/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);
 	}