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

scst: Port to UEK 4

Browse Source 
Reported-by: Gilbert Standen <gilstanden@hotmail.com>


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8619 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2019-10-13 21:28:19 +00:00
parent 0c2a242249
commit c027b9de7e
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -9,8 +9,11 @@
*.o *.o
*.o.d *.o.d
*.orig *.orig
*.sdtinfo.c
*.sdtstub.S
*~ *~
.cache.mk .cache.mk
.ctf
.depend_adm .depend_adm
.depend_d .depend_d
.depend_f .depend_f

4
qla2x00t-32gbit/qla_os.c
View File

@@ -7161,7 +7161,9 @@ static int qla2xxx_map_queues(struct Scsi_Host *shost)
if (USER_CTRL_IRQ(vha->hw)) if (USER_CTRL_IRQ(vha->hw))
rc = blk_mq_map_queues(&shost->tag_set); rc = blk_mq_map_queues(&shost->tag_set);
else else
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0) && \ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0) && \
(!defined(UEK_KABI_RENAME) || \
LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)) && \
!defined(CONFIG_SUSE_KERNEL) !defined(CONFIG_SUSE_KERNEL)
/* /*
* See also commit f23f5bece686 ("blk-mq: Allow PCI vector * See also commit f23f5bece686 ("blk-mq: Allow PCI vector

10
scst/include/backport.h
View File

@@ -859,6 +859,7 @@ static inline void mempool_destroy_backport(mempool_t *pool)
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) && \ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7 || \ (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7 || \
(RHEL_MAJOR -0 == 7 && RHEL_MINOR -0 < 5)) && \ (RHEL_MAJOR -0 == 7 && RHEL_MINOR -0 < 5)) && \
!defined(UEK_KABI_RENAME) && \
!defined(_COMPAT_LINUX_MM_H) !defined(_COMPAT_LINUX_MM_H)
/* See also commit a7c3e901a46f ("mm: introduce kv[mz]alloc helpers") # v4.12 */ /* See also commit a7c3e901a46f ("mm: introduce kv[mz]alloc helpers") # v4.12 */
static inline void *kvmalloc_node(size_t size, gfp_t flags, int node) static inline void *kvmalloc_node(size_t size, gfp_t flags, int node)
@@ -1379,8 +1380,13 @@ static inline struct kmem_cache *kmem_cache_create_usercopy(const char *name,
{ {
return kmem_cache_create(name, size, align, flags, ctor, NULL); return kmem_cache_create(name, size, align, flags, ctor, NULL);
} }
/* UEKR5 is based on kernel v4.14.35 but has a backport of the v4.16 API. */ /*
#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) && !defined(UEK_KABI_RENAME) * UEK4 is based on kernel v4.1.12 and does not have a backport of the v4.16
* API. UEK5 is based on kernel v4.14.35 and has a backport of the v4.16 API.
*/
#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) && \
(!defined(UEK_KABI_RENAME) || \
LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0))
static inline struct kmem_cache *kmem_cache_create_usercopy(const char *name, static inline struct kmem_cache *kmem_cache_create_usercopy(const char *name,
unsigned int size, unsigned int align, unsigned int size, unsigned int align,
unsigned long flags, unsigned long flags,