projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[cascardo/linux.git]
/
include
/
linux
/
genalloc.h
diff --git
a/include/linux/genalloc.h
b/include/linux/genalloc.h
index
5383bb1
..
7ff168d
100644
(file)
--- a/
include/linux/genalloc.h
+++ b/
include/linux/genalloc.h
@@
-59,6
+59,8
@@
struct gen_pool {
genpool_algo_t algo; /* allocation function */
void *data;
genpool_algo_t algo; /* allocation function */
void *data;
+
+ const char *name;
};
/*
};
/*
@@
-118,8
+120,8
@@
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,
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 *gen_pool_get(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);
bool addr_in_gen_pool(struct gen_pool *pool, unsigned long start,
size_t size);