From 72c92e416df1a9ccdfc59398d388a5f7b77235fc Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 17 Sep 2018 23:31:37 +0200 Subject: header: Add kvzalloc() This adds the kvzalloc() function and allows it to remove the lib-rhashtable.patch patch. Signed-off-by: Hauke Mehrtens [fix commit message kzalloc -> kvzalloc] Signed-off-by: Johannes Berg --- backport/backport-include/linux/mm.h | 6 ++++++ patches/lib-rhashtable.patch | 18 ------------------ 2 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 patches/lib-rhashtable.patch diff --git a/backport/backport-include/linux/mm.h b/backport/backport-include/linux/mm.h index 7e69b873..38c452e2 100644 --- a/backport/backport-include/linux/mm.h +++ b/backport/backport-include/linux/mm.h @@ -112,6 +112,12 @@ static inline void *kvmalloc_array(size_t n, size_t size, gfp_t flags) return kvmalloc(bytes, flags); } + +#define kvzalloc LINUX_BACKPORT(kvzalloc) +static inline void *kvzalloc(size_t size, gfp_t flags) +{ + return kvmalloc(size, flags | __GFP_ZERO); +} #endif #endif /* __BACKPORT_MM_H */ diff --git a/patches/lib-rhashtable.patch b/patches/lib-rhashtable.patch deleted file mode 100644 index 2e91f8d9..00000000 --- a/patches/lib-rhashtable.patch +++ /dev/null @@ -1,18 +0,0 @@ - ---- a/compat/lib-rhashtable.c -+++ b/compat/lib-rhashtable.c -@@ -175,10 +175,11 @@ static struct bucket_table *bucket_table - int i; - - size = sizeof(*tbl) + nbuckets * sizeof(tbl->buckets[0]); -- if (gfp != GFP_KERNEL) -+ if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER) || -+ gfp != GFP_KERNEL) - tbl = kzalloc(size, gfp | __GFP_NOWARN | __GFP_NORETRY); -- else -- tbl = kvzalloc(size, gfp); -+ if (tbl == NULL && gfp == GFP_KERNEL) -+ tbl = vzalloc(size); - - size = nbuckets; - -- cgit v1.2.3