projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux into drm...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
mempool.c
diff --git
a/mm/mempool.c
b/mm/mempool.c
index
5499047
..
659aa42
100644
(file)
--- a/
mm/mempool.c
+++ b/
mm/mempool.c
@@
-73,7
+73,7
@@
mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn,
gfp_t gfp_mask, int node_id)
{
mempool_t *pool;
gfp_t gfp_mask, int node_id)
{
mempool_t *pool;
- pool = k
malloc_node(sizeof(*pool), gfp_mask | __GFP_ZERO
, node_id);
+ pool = k
zalloc_node(sizeof(*pool), gfp_mask
, node_id);
if (!pool)
return NULL;
pool->elements = kmalloc_node(min_nr * sizeof(void *),
if (!pool)
return NULL;
pool->elements = kmalloc_node(min_nr * sizeof(void *),