scst: Fix the MOFED build

Reported-by: Dmitry Popovich <dsp@mvdnet.org>


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8479 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2019-07-24 15:33:53 +00:00
parent 7426031e91
commit 5930b4db71

View File

@@ -905,9 +905,8 @@ static inline void *kvzalloc(size_t size, gfp_t flags)
} }
#endif #endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) && \ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) && \
(!defined(MOFED_MAJOR) || !defined(MOFED_MINOR) || \ !defined(_COMPAT_LINUX_MM_H)
MOFED_MAJOR -0 < 4 || (MOFED_MAJOR -0 == 4 && MOFED_MINOR -0 < 5))
/* See also commit 1c542f38ab8d ("mm: Introduce kvcalloc()") # v4.18. */ /* See also commit 1c542f38ab8d ("mm: Introduce kvcalloc()") # v4.18. */
static inline void *kvcalloc(size_t n, size_t size, gfp_t flags) 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) (__flags), NULL, NULL)
#endif #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 * See also commit 3942d2991852 ("mm/slab_common: allow NULL cache pointer in
* kmem_cache_destroy()") # v4.3. * kmem_cache_destroy()") # v4.3.