]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
agp: add no warn since we have a fallback to vmalloc paths
authorDave Airlie <airlied@redhat.com>
Tue, 15 Jun 2010 01:02:05 +0000 (11:02 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 15 Jun 2010 01:02:32 +0000 (11:02 +1000)
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>
drivers/char/agp/generic.c

index 4e414417730b3f91ee616831773fbb522da109bf..d2abf51439836383fd9b03612a44bdf1779448fa 100644 (file)
@@ -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);
        }