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
mm/page-writeback.c: fix divide by zero in bdi_dirty_limits()
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
mempool.c
diff --git
a/mm/mempool.c
b/mm/mempool.c
index
d904981
..
659aa42
100644
(file)
--- a/
mm/mempool.c
+++ b/
mm/mempool.c
@@
-63,19
+63,21
@@
EXPORT_SYMBOL(mempool_destroy);
mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn,
mempool_free_t *free_fn, void *pool_data)
{
mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn,
mempool_free_t *free_fn, void *pool_data)
{
- return mempool_create_node(min_nr,alloc_fn,free_fn, pool_data,-1);
+ return mempool_create_node(min_nr,alloc_fn,free_fn, pool_data,
+ GFP_KERNEL, NUMA_NO_NODE);
}
EXPORT_SYMBOL(mempool_create);
mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn,
}
EXPORT_SYMBOL(mempool_create);
mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn,
- mempool_free_t *free_fn, void *pool_data, int node_id)
+ mempool_free_t *free_fn, void *pool_data,
+ gfp_t gfp_mask, int node_id)
{
mempool_t *pool;
{
mempool_t *pool;
- pool = k
malloc_node(sizeof(*pool), GFP_KERNEL | __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 *),
-
GFP_KERNEL
, node_id);
+
gfp_mask
, node_id);
if (!pool->elements) {
kfree(pool);
return NULL;
if (!pool->elements) {
kfree(pool);
return NULL;
@@
-93,7
+95,7
@@
mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn,
while (pool->curr_nr < pool->min_nr) {
void *element;
while (pool->curr_nr < pool->min_nr) {
void *element;
- element = pool->alloc(
GFP_KERNEL
, pool->pool_data);
+ element = pool->alloc(
gfp_mask
, pool->pool_data);
if (unlikely(!element)) {
mempool_destroy(pool);
return NULL;
if (unlikely(!element)) {
mempool_destroy(pool);
return NULL;