From cea9021f4c350aa204c228e5adbf97641fe16490 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 27 Jul 2017 20:16:16 +0200 Subject: compat: work around odd kernels that backport kv[mz]alloc --- src/compat/compat.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') 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 #include #include -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) -- cgit v1.2.3-59-g8ed1b