compat: Avoid kthread compilation on kernels that include kthread

This is required to support RHEL6.6

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>

diff --git a/compat/Makefile b/compat/Makefile
index c50562f9d5662627620f110f636d6965a7e6b854..b9b093043898a072ab1e08954e343a601e335a00 100644 (file)
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -26,9 +26,11 @@ compat-$(CONFIG_COMPAT_KERNEL_2_6_32) += compat-2.6.32.o
 
 compat-$(CONFIG_COMPAT_KERNEL_2_6_33) += compat-2.6.33.o
 compat-$(CONFIG_COMPAT_KERNEL_2_6_34) += compat-2.6.34.o
-compat-$(CONFIG_COMPAT_KERNEL_2_6_35) += \
-       compat-2.6.35.o \
-       kthread.o
+compat-$(CONFIG_COMPAT_KERNEL_2_6_35) += compat-2.6.35.o
+
+ifeq ($(CONFIG_COMPAT_IS_KTHREAD),)
+compat-$(CONFIG_COMPAT_KERNEL_2_6_35) += kthread.o
+endif
 
 compat-$(CONFIG_COMPAT_KERNEL_2_6_36) += compat-2.6.36.o
 

diff --git a/include/linux/kthread.h b/include/linux/kthread.h
index b9c7efac5c032366b347dc37ca62ee52c6e5a736..0c03279a3953b63b45a66590e331bf13983ae83b 100644 (file)
--- a/include/linux/kthread.h
+++ b/include/linux/kthread.h
@@ -15,7 +15,7 @@
 
 #include_next <linux/kthread.h>
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35))
+#ifndef CONFIG_COMPAT_IS_KTHREAD
 
 struct kthread_work;
 typedef void (*kthread_work_func_t)(struct kthread_work *work);
@@ -106,7 +106,7 @@ void flush_kthread_worker(struct kthread_worker *worker);
 #define kthread_create_on_node(threadfn, data, node, namefmt, arg...) \
        kthread_create(threadfn, data, namefmt, ##arg)
 
-#endif /* LINUX_VERSION_CODE < 2.6.38 */
+#endif /* CONFIG_COMPAT_IS_KTHREAD */
 
 #endif /* _LINUX_KTHREAD_H */