summaryrefslogtreecommitdiffstats
path: root/kernel/include/linux/genalloc.h
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/include/linux/genalloc.h')
-rw-r--r--kernel/include/linux/genalloc.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel/include/linux/genalloc.h b/kernel/include/linux/genalloc.h
index 1ccaab44a..7ff168d06 100644
--- a/kernel/include/linux/genalloc.h
+++ b/kernel/include/linux/genalloc.h
@@ -59,6 +59,8 @@ struct gen_pool {
genpool_algo_t algo; /* allocation function */
void *data;
+
+ const char *name;
};
/*
@@ -118,17 +120,17 @@ extern unsigned long gen_pool_best_fit(unsigned long *map, unsigned long size,
unsigned long start, unsigned int nr, void *data);
extern struct gen_pool *devm_gen_pool_create(struct device *dev,
- int min_alloc_order, int nid);
-extern struct gen_pool *dev_get_gen_pool(struct device *dev);
+ int min_alloc_order, int nid, const char *name);
+extern struct gen_pool *gen_pool_get(struct device *dev, const char *name);
bool addr_in_gen_pool(struct gen_pool *pool, unsigned long start,
size_t size);
#ifdef CONFIG_OF
-extern struct gen_pool *of_get_named_gen_pool(struct device_node *np,
+extern struct gen_pool *of_gen_pool_get(struct device_node *np,
const char *propname, int index);
#else
-static inline struct gen_pool *of_get_named_gen_pool(struct device_node *np,
+static inline struct gen_pool *of_gen_pool_get(struct device_node *np,
const char *propname, int index)
{
return NULL;