From 39b6e879351aba60483962ec4ade6c6a16e862db Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 21 Nov 2020 03:04:57 +0000 Subject: [PATCH] scst: Unbreak the build for kernel 4.1.12-124.45.2.el7uek.x86_64 Apparently this kernel has kvmalloc_node(), kvmalloc() and kvzalloc() backports but no kvmalloc_array() backport. See also the following commits: * c027b9de7e82 ("scst: Port to UEK 4") * 23a2753a9c1b ("scst/include/backport.h: Add backports for additional kernel functions, constants and data structures") Reported-by: Gilbert Standen git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9185 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/backport.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scst/include/backport.h b/scst/include/backport.h index f8d91e996..508fcf011 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -991,8 +991,8 @@ static inline void mempool_destroy_backport(mempool_t *pool) #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) && \ (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7 || \ (RHEL_MAJOR -0 == 7 && RHEL_MINOR -0 < 5)) && \ - !defined(UEK_KABI_RENAME) && \ !defined(_COMPAT_LINUX_MM_H) +#if !defined(UEK_KABI_RENAME) /* See also commit a7c3e901a46f ("mm: introduce kv[mz]alloc helpers") # v4.12 */ static inline void *kvmalloc_node(size_t size, gfp_t flags, int node) { @@ -1047,6 +1047,7 @@ static inline void *kvzalloc(size_t size, gfp_t flags) { return kvmalloc(size, flags | __GFP_ZERO); } +#endif /* * See also commit 752ade68cbd8 ("treewide: use kv[mz]alloc* rather than