---

yaml --- r: 200713 b: refs/heads/master c: 1c48bc5 h: refs/heads/master i: 200711: c0255b1 v: v3
git-mirror · Jun 15, 2010 · 2fda6bb · 2fda6bb
1 parent b531d09
commit 2fda6bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);
 	}