LinCAN partial update of thread helper support for 2.6.27+ kernels.

[lincan.git] / lincan / src / kthread.c

diff --git a/lincan/src/kthread.c b/lincan/src/kthread.c
index cce9ff53bf993d1632e2f60112294f37485f094e..ae43c306384a88f8878fda263d3c9f515449f6e0 100644 (file)
--- a/lincan/src/kthread.c
+++ b/lincan/src/kthread.c
@@ -1,5 +1,7 @@
-#include <linux/config.h>
 #include <linux/version.h>
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17))
+#include <linux/config.h>
+#endif
 
 #if defined(MODVERSIONS)
 #include <linux/modversions.h>
@@ -10,15 +12,21 @@
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,40))
   #include <linux/tqueue.h>
 #else
-  #include <linux/devfs_fs_kernel.h>
+  #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17))
+    #include <linux/devfs_fs_kernel.h>
+  #endif
 #endif
 
 #include <linux/wait.h>
 #include <linux/signal.h>
 #include <linux/interrupt.h>
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
+  #include <asm/semaphore.h>
+#else
+  #include <linux/semaphore.h>
+#endif
 
-#include <asm/semaphore.h>
 #include <linux/smp_lock.h>
 
 #include "../include/kthread.h"
@@ -99,7 +107,7 @@ void stop_kthread(kthread_t *kthread)
     sema_init(&kthread->startstop_sem,0);
 
     /* We need to do a memory barrier here to be sure that
-       the flags are visible on all CPUs. 
+       the flags are visible on all CPUs.
     */
     mb();
 
@@ -107,7 +115,7 @@ void stop_kthread(kthread_t *kthread)
     kthread->terminate = 1;
 
     /* We need to do a memory barrier here to be sure that
-       the flags are visible on all CPUs. 
+       the flags are visible on all CPUs.
     */
     mb();
     kill_proc(kthread->thread->pid, SIGKILL, 1);