From aaf96673e6dffaf7f195c66ecd556385be55b219 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 14 Nov 2020 17:20:30 +0000 Subject: [PATCH] scst: Unbreak the UEK 4 build UEK 4 RPMs like kernel-uek-4.14.35-2025.402.2.1.el7uek.x86_64 include a backport of cpu_to_be32_array() and kvcalloc(). Hence disable the SCST backports for these functions when building against UEK 4. Reported-by: Gilbert Standen git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9179 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/backport.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scst/include/backport.h b/scst/include/backport.h index 17b0e5ec5..06616614a 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -192,7 +192,8 @@ static inline void *bsg_job_sense(struct bsg_job *job) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) && \ (!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) static inline void cpu_to_be32_array(__be32 *dst, const u32 *src, size_t len) { int i; @@ -1052,7 +1053,8 @@ static inline void *kvmalloc_array(size_t n, size_t size, gfp_t flags) (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7 || \ RHEL_MAJOR -0 == 7 && RHEL_MINOR -0 < 7) && \ !defined(CONFIG_SUSE_KERNEL) && \ - !defined(_COMPAT_LINUX_MM_H) + !defined(_COMPAT_LINUX_MM_H) && \ + !defined(UEK_KABI_RENAME) /* See also commit 1c542f38ab8d ("mm: Introduce kvcalloc()") # v4.18. */ static inline void *kvcalloc(size_t n, size_t size, gfp_t flags) {