From 5930b4db714553328c0a34759bb660152f2fe398 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 24 Jul 2019 15:33:53 +0000 Subject: [PATCH] scst: Fix the MOFED build Reported-by: Dmitry Popovich git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8479 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/backport.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scst/include/backport.h b/scst/include/backport.h index 7588b5f33..470740508 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -905,9 +905,8 @@ static inline void *kvzalloc(size_t size, gfp_t flags) } #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) && \ - (!defined(MOFED_MAJOR) || !defined(MOFED_MINOR) || \ - MOFED_MAJOR -0 < 4 || (MOFED_MAJOR -0 == 4 && MOFED_MINOR -0 < 5)) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) && \ + !defined(_COMPAT_LINUX_MM_H) /* See also commit 1c542f38ab8d ("mm: Introduce kvcalloc()") # v4.18. */ static inline void *kvcalloc(size_t n, size_t size, gfp_t flags) { @@ -1334,7 +1333,8 @@ static inline void sg_unmark_end(struct scatterlist *sg) (__flags), NULL, NULL) #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) && \ + !defined(_COMPAT_LINUX_MM_H) /* * See also commit 3942d2991852 ("mm/slab_common: allow NULL cache pointer in * kmem_cache_destroy()") # v4.3.