From e24843ced542cf014d58c47beebaae8055f9a4f4 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 31 Mar 2019 04:20:09 +0000 Subject: [PATCH] scst: Fix kvfree() backport version check for kernel versions v3.12.41.. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8112 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/backport.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scst/include/backport.h b/scst/include/backport.h index bfc83fd84..9c636c5a5 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -863,10 +863,13 @@ static inline void *kvcalloc(size_t n, size_t size, gfp_t flags) } #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) && \ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) && \ + !(LINUX_VERSION_CODE >> 8 == KERNEL_VERSION(3, 12, 0) >> 8 && \ + LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 41)) && \ (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 6) /* * See also commit 39f1f78d53b9 ("nick kvfree() from apparmor") # v3.15. + * See also commit fb6a2a8ebe27 ("nick kvfree() from apparmor") # v3.12.41. */ static inline void kvfree(void *addr) {