Commit c5293615 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] sound_alloc_dmap memory allocation warning suppression

alloc_pages() failures are expected here.  Manually prevent warnings.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent be6ab017
...@@ -88,7 +88,7 @@ static int sound_alloc_dmap(struct dma_buffparms *dmap) ...@@ -88,7 +88,7 @@ static int sound_alloc_dmap(struct dma_buffparms *dmap)
while (start_addr == NULL && dmap->buffsize > PAGE_SIZE) { while (start_addr == NULL && dmap->buffsize > PAGE_SIZE) {
for (sz = 0, size = PAGE_SIZE; size < dmap->buffsize; sz++, size <<= 1); for (sz = 0, size = PAGE_SIZE; size < dmap->buffsize; sz++, size <<= 1);
dmap->buffsize = PAGE_SIZE * (1 << sz); dmap->buffsize = PAGE_SIZE * (1 << sz);
start_addr = (char *) __get_free_pages(GFP_ATOMIC|GFP_DMA, sz); start_addr = (char *) __get_free_pages(GFP_ATOMIC|GFP_DMA|__GFP_NOWARN, sz);
if (start_addr == NULL) if (start_addr == NULL)
dmap->buffsize /= 2; dmap->buffsize /= 2;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment