Merge r7431 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7684 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2018-11-04 04:15:37 +00:00
parent 3ed6cd492b
commit 47617e0a78

View File

@@ -678,7 +678,7 @@ static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
static inline struct kmem_cache *kmem_cache_create_usercopy(const char *name,
unsigned int size, unsigned int align,
slab_flags_t flags,
unsigned long flags,
unsigned int useroffset, unsigned int usersize,
void (*ctor)(void *))
{
@@ -687,7 +687,7 @@ static inline struct kmem_cache *kmem_cache_create_usercopy(const char *name,
#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
static inline struct kmem_cache *kmem_cache_create_usercopy(const char *name,
unsigned int size, unsigned int align,
slab_flags_t flags,
unsigned long flags,
unsigned int useroffset, unsigned int usersize,
void (*ctor)(void *))
{