X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fbase%2Fdmapool.c;h=e2f64f91ed0558fcc6b9a70feb9620170685c485;hb=467c432a4d63349025d92f5dbdd0b9ba8ff40fd5;hp=60a7ef6a201b879ecedafe996c36c730259d4ba6;hpb=7f93220b624de1b7d9fcff8a2cebd6fce7ed4665;p=linux-2.6 diff --git a/drivers/base/dmapool.c b/drivers/base/dmapool.c index 60a7ef6a20..e2f64f91ed 100644 --- a/drivers/base/dmapool.c +++ b/drivers/base/dmapool.c @@ -156,7 +156,7 @@ dma_pool_create (const char *name, struct device *dev, static struct dma_page * -pool_alloc_page (struct dma_pool *pool, unsigned int __nocast mem_flags) +pool_alloc_page (struct dma_pool *pool, gfp_t mem_flags) { struct dma_page *page; int mapsize; @@ -262,8 +262,7 @@ dma_pool_destroy (struct dma_pool *pool) * If such a memory block can't be allocated, null is returned. */ void * -dma_pool_alloc (struct dma_pool *pool, unsigned int __nocast mem_flags, - dma_addr_t *handle) +dma_pool_alloc (struct dma_pool *pool, gfp_t mem_flags, dma_addr_t *handle) { unsigned long flags; struct dma_page *page;