summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2017-07-27 20:16:16 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2017-07-27 20:16:16 +0200
commitcea9021f4c350aa204c228e5adbf97641fe16490 (patch)
tree070d9e00c0831daebf3503495372d6f1dcf0a1c6 /src
parentandroid: fix readme (diff)
downloadwireguard-monolithic-historical-cea9021f4c350aa204c228e5adbf97641fe16490.tar.xz
wireguard-monolithic-historical-cea9021f4c350aa204c228e5adbf97641fe16490.zip
compat: work around odd kernels that backport kv[mz]alloc
Diffstat (limited to 'src')
-rw-r--r--src/compat/compat.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/compat/compat.h b/src/compat/compat.h
index a1a5061..67240ce 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -304,7 +304,7 @@ static inline u64 ktime_get_ns(void)
#include <linux/vmalloc.h>
#include <linux/mm.h>
#include <linux/slab.h>
-static inline void *kvmalloc(size_t size, gfp_t flags)
+static inline void *kvmalloc_ours(size_t size, gfp_t flags)
{
gfp_t kmalloc_flags = flags;
void *ret;
@@ -318,10 +318,12 @@ static inline void *kvmalloc(size_t size, gfp_t flags)
return ret;
return __vmalloc(size, flags, PAGE_KERNEL);
}
-static inline void *kvzalloc(size_t size, gfp_t flags)
+static inline void *kvzalloc_ours(size_t size, gfp_t flags)
{
- return kvmalloc(size, flags | __GFP_ZERO);
+ return kvmalloc_ours(size, flags | __GFP_ZERO);
}
+#define kvmalloc kvmalloc_ours
+#define kvzalloc kvzalloc_ours
#endif
#if ((LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)) || LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 41)) && !defined(ISUBUNTU1404)