diff options
author | Michael Opdenacker <michael.opdenacker@free-electrons.com> | 2013-06-25 18:16:55 +0200 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2013-07-07 19:02:59 +0300 |
commit | e7efa615ccf78394338144ff0187be331240748a (patch) | |
tree | 7daaf9b4106ec8fb9e8e946a07fcc2b7cf901547 /include/linux/slob_def.h | |
parent | 0f8f8094d28eb53368ac09186ea6b3a324cc7d44 (diff) |
slab: add kmalloc() to kernel API documentation
At the moment, kmalloc() isn't even listed in the kernel API
documentation (DocBook/kernel-api.html after running "make htmldocs").
Another issue is that the documentation for kmalloc_node()
refers to kcalloc()'s documentation to describe its 'flags' parameter,
while kcalloc() refered to kmalloc()'s documentation, which doesn't exist!
This patch is a proposed fix for this. It also removes the documentation
for kmalloc() in include/linux/slob_def.h which isn't included to
generate the documentation anyway. This way, kmalloc() is described
in only one place.
Acked-by: Christoph Lameter <cl@linux.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'include/linux/slob_def.h')
-rw-r--r-- | include/linux/slob_def.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h index f28e14a12e3..095a5a4a851 100644 --- a/include/linux/slob_def.h +++ b/include/linux/slob_def.h @@ -18,14 +18,6 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) return __kmalloc_node(size, flags, node); } -/** - * kmalloc - allocate memory - * @size: how many bytes of memory are required. - * @flags: the type of memory to allocate (see kcalloc). - * - * kmalloc is the normal method of allocating memory - * in the kernel. - */ static __always_inline void *kmalloc(size_t size, gfp_t flags) { return __kmalloc_node(size, flags, NUMA_NO_NODE); |