diff options
Diffstat (limited to 'drivers/base/dmapool.c')
-rw-r--r-- | drivers/base/dmapool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/dmapool.c b/drivers/base/dmapool.c index b2efbd4cf710..dbe0735f8c9e 100644 --- a/drivers/base/dmapool.c +++ b/drivers/base/dmapool.c | |||
@@ -126,7 +126,7 @@ dma_pool_create (const char *name, struct device *dev, | |||
126 | } else if (allocation < size) | 126 | } else if (allocation < size) |
127 | return NULL; | 127 | return NULL; |
128 | 128 | ||
129 | if (!(retval = kmalloc (sizeof *retval, SLAB_KERNEL))) | 129 | if (!(retval = kmalloc (sizeof *retval, GFP_KERNEL))) |
130 | return retval; | 130 | return retval; |
131 | 131 | ||
132 | strlcpy (retval->name, name, sizeof retval->name); | 132 | strlcpy (retval->name, name, sizeof retval->name); |
@@ -297,7 +297,7 @@ restart: | |||
297 | } | 297 | } |
298 | } | 298 | } |
299 | } | 299 | } |
300 | if (!(page = pool_alloc_page (pool, SLAB_ATOMIC))) { | 300 | if (!(page = pool_alloc_page (pool, GFP_ATOMIC))) { |
301 | if (mem_flags & __GFP_WAIT) { | 301 | if (mem_flags & __GFP_WAIT) { |
302 | DECLARE_WAITQUEUE (wait, current); | 302 | DECLARE_WAITQUEUE (wait, current); |
303 | 303 | ||