summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-06-15 11:02:05 +1000
committerDave Airlie <airlied@redhat.com>2010-06-15 11:02:32 +1000
commit1c48bc5f71cd7783e19fb8d9462be53f829be177 (patch)
treee3ed0d8125dd6b30911dd4445fc5b3ff423a26f3 /drivers/char
parentda931a931da85218add949266238c54b5fecd37f (diff)
downloadlinux-1c48bc5f71cd7783e19fb8d9462be53f829be177.tar.gz
linux-1c48bc5f71cd7783e19fb8d9462be53f829be177.tar.xz
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>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/agp/generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 4e414417730b..d2abf5143983 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);
}