summaryrefslogtreecommitdiff
path: root/include/linux/vmalloc.h
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2017-05-22 09:32:40 +0300
committerJames Morris <james.l.morris@oracle.com>2017-05-22 09:32:40 +0300
commitd68c51e0b377838dd31b37707813bb62089f399c (patch)
tree4557d5ced33ea6da60bc84ee288af9924192f046 /include/linux/vmalloc.h
parent99c55fb18fc48508ae5bba57146a556aacc4558c (diff)
parent08332893e37af6ae779367e78e444f8f9571511d (diff)
downloadlinux-d68c51e0b377838dd31b37707813bb62089f399c.tar.xz
Sync to mainline for security submaintainers to work against
Diffstat (limited to 'include/linux/vmalloc.h')
-rw-r--r--include/linux/vmalloc.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index d68edffbf142..2d92dd002abd 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -80,6 +80,17 @@ extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
unsigned long start, unsigned long end, gfp_t gfp_mask,
pgprot_t prot, unsigned long vm_flags, int node,
const void *caller);
+#ifndef CONFIG_MMU
+extern void *__vmalloc_node_flags(unsigned long size, int node, gfp_t flags);
+static inline void *__vmalloc_node_flags_caller(unsigned long size, int node,
+ gfp_t flags, void *caller)
+{
+ return __vmalloc_node_flags(size, node, flags);
+}
+#else
+extern void *__vmalloc_node_flags_caller(unsigned long size,
+ int node, gfp_t flags, void *caller);
+#endif
extern void vfree(const void *addr);
extern void vfree_atomic(const void *addr);