[kernel] r15964 - in dists/sid/linux-2.6/debian: . patches/bugfix/all

[Maximilian Attems]

Author: maks
Date: Wed Jul  7 10:36:45 2010
New Revision: 15964

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

Reported-by: Julien Cristau <jcristau at debian.org>

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/agp-add-no-warn-since-we-have-a-fallback-to-vmalloc-.patch
Modified:
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Jul  7 03:23:51 2010	(r15963)
+++ dists/sid/linux-2.6/debian/changelog	Wed Jul  7 10:36:45 2010	(r15964)
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.32-17) unstable; urgency=low
+
+  * agp: add no warn since we have a fallback to vmalloc paths.
+
+ -- maximilian attems <maks at debian.org>  Wed, 07 Jul 2010 12:33:04 +0200
+
 linux-2.6 (2.6.32-16) unstable; urgency=low
 
   [ dann frazier ]

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/agp-add-no-warn-since-we-have-a-fallback-to-vmalloc-.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/agp-add-no-warn-since-we-have-a-fallback-to-vmalloc-.patch	Wed Jul  7 10:36:45 2010	(r15964)
@@ -0,0 +1,29 @@
+From 1c48bc5f71cd7783e19fb8d9462be53f829be177 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Tue, 15 Jun 2010 11:02:05 +1000
+Subject: [PATCH] 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 at redhat.com>
+---
+ drivers/char/agp/generic.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
+index 4e41441..d2abf51 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);
+ 	}
+-- 
+1.7.1
+