summaryrefslogtreecommitdiffstats
path: root/include/linux/genalloc.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-05-28 12:01:07 +0200
committerJiri Kosina <jkosina@suse.cz>2013-05-28 12:01:07 +0200
commit6e9041c6ddd6cbdc61d87bcaca8ca7bb17c28377 (patch)
treec250644c5adce04947d664318996de16df3f02da /include/linux/genalloc.h
parentb96516220870d8571fc12da980668687c122976e (diff)
parente4aa937ec75df0eea0bee03bffa3303ad36c986b (diff)
downloadcachepc-linux-6e9041c6ddd6cbdc61d87bcaca8ca7bb17c28377.tar.gz
cachepc-linux-6e9041c6ddd6cbdc61d87bcaca8ca7bb17c28377.zip
Merge branch 'master' into for-next
Diffstat (limited to 'include/linux/genalloc.h')
-rw-r--r--include/linux/genalloc.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/include/linux/genalloc.h b/include/linux/genalloc.h
index dd7c569aacad..661d374aeb2d 100644
--- a/include/linux/genalloc.h
+++ b/include/linux/genalloc.h
@@ -29,6 +29,10 @@
#ifndef __GENALLOC_H__
#define __GENALLOC_H__
+
+struct device;
+struct device_node;
+
/**
* Allocation callback function type definition
* @map: Pointer to bitmap
@@ -105,4 +109,18 @@ extern unsigned long gen_pool_first_fit(unsigned long *map, unsigned long size,
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);
+
+#ifdef CONFIG_OF
+extern struct gen_pool *of_get_named_gen_pool(struct device_node *np,
+ const char *propname, int index);
+#else
+static inline struct gen_pool *of_get_named_gen_pool(struct device_node *np,
+ const char *propname, int index)
+{
+ return NULL;
+}
+#endif
#endif /* __GENALLOC_H__ */