diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-11 01:48:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-11 01:48:37 -0400 |
| commit | 1a04392bd6439876b1552793389cbb5be356ea54 (patch) | |
| tree | 12af7b77e3b0848127f2d2871778c9c1f315578a /drivers/base/dmapool.c | |
| parent | 68399bb5080c1d96f2110b0a040b39d3ccd7a18a (diff) | |
| parent | 3c92c2ba33cd7d666c5f83cc32aa590e794e91b0 (diff) | |
| download | kernel_samsung_espresso10-1a04392bd6439876b1552793389cbb5be356ea54.zip kernel_samsung_espresso10-1a04392bd6439876b1552793389cbb5be356ea54.tar.gz kernel_samsung_espresso10-1a04392bd6439876b1552793389cbb5be356ea54.tar.bz2 | |
Merge branch 'master'
Diffstat (limited to 'drivers/base/dmapool.c')
| -rw-r--r-- | drivers/base/dmapool.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/base/dmapool.c b/drivers/base/dmapool.c index 60a7ef6..e2f64f9 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; |