diff options
-rw-r--r-- | drivers/base/dmapool.c | 3 | ||||
-rw-r--r-- | include/linux/dmapool.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/base/dmapool.c b/drivers/base/dmapool.c index c4aebf2f522d..60a7ef6a201b 100644 --- a/drivers/base/dmapool.c +++ b/drivers/base/dmapool.c | |||
@@ -262,7 +262,8 @@ dma_pool_destroy (struct dma_pool *pool) | |||
262 | * If such a memory block can't be allocated, null is returned. | 262 | * If such a memory block can't be allocated, null is returned. |
263 | */ | 263 | */ |
264 | void * | 264 | void * |
265 | dma_pool_alloc (struct dma_pool *pool, int mem_flags, dma_addr_t *handle) | 265 | dma_pool_alloc (struct dma_pool *pool, unsigned int __nocast mem_flags, |
266 | dma_addr_t *handle) | ||
266 | { | 267 | { |
267 | unsigned long flags; | 268 | unsigned long flags; |
268 | struct dma_page *page; | 269 | struct dma_page *page; |
diff --git a/include/linux/dmapool.h b/include/linux/dmapool.h index e60bfdac348d..4932ee5c77f0 100644 --- a/include/linux/dmapool.h +++ b/include/linux/dmapool.h | |||
@@ -19,7 +19,8 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, | |||
19 | 19 | ||
20 | void dma_pool_destroy(struct dma_pool *pool); | 20 | void dma_pool_destroy(struct dma_pool *pool); |
21 | 21 | ||
22 | void *dma_pool_alloc(struct dma_pool *pool, int mem_flags, dma_addr_t *handle); | 22 | void *dma_pool_alloc(struct dma_pool *pool, unsigned int __nocast mem_flags, |
23 | dma_addr_t *handle); | ||
23 | 24 | ||
24 | void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t addr); | 25 | void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t addr); |
25 | 26 | ||