mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-17 18:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-07-24 08:35:33 -07:00
parent 55a732e1c2 5930b4db71
commit ff074f34df
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scst/include/backport.h
View File

@@ -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.