From 47617e0a784d2e17833dddc23974025f71fadeb0 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 04:15:37 +0000 Subject: [PATCH] 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 --- scst/include/backport.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scst/include/backport.h b/scst/include/backport.h index 9ce75e096..3da7ac6db 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -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 *)) {