diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-27 22:26:44 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-27 22:26:44 +0200 |
| commit | a976c2951d8f376112361830aa7762beff83a205 (patch) | |
| tree | 24f6647aedd4b570cb67f3195962f5c8a040c824 /include/linux/vmalloc.h | |
| parent | 83848fbe7e6af978c080a88c130a67178b1ac0e4 (diff) | |
| parent | 16b9951f656ea8f2b47546bd898325a7e256932f (diff) | |
Merge back ACPICA material for v4.13.
Diffstat (limited to 'include/linux/vmalloc.h')
| -rw-r--r-- | include/linux/vmalloc.h | 11 |
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); |