From: ppisa <pisa@cmp.felk.cvut.cz>
Date: Sat, 1 Nov 2008 01:51:16 +0000 (+0100)
Subject: Merge: LinCAN partial update of thread helper support for 2.6.27+ kernels.
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/cd29136f5e7d59be1b9868691436df0fb54d1ecd?hp=35ac1dde7cd61cd64858642740736685dc03e7df

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

Merge commit 'remotes/sf-ocera-lincan/master'
---

diff --git a/lincan/include/kthread.h b/lincan/include/kthread.h
index 2c570b0..395b04b 100644
--- a/lincan/include/kthread.h
+++ b/lincan/include/kthread.h
@@ -21,7 +21,12 @@
 #include <linux/interrupt.h>
 
 #include <asm/unistd.h>
-#include <asm/semaphore.h>
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
+  #include <asm/semaphore.h>
+#else
+  #include <linux/semaphore.h>
+#endif
 
 /* a structure to store all information we need
    for our thread */
diff --git a/lincan/src/kthread.c b/lincan/src/kthread.c
index 2d387d3..ae43c30 100644
--- a/lincan/src/kthread.c
+++ b/lincan/src/kthread.c
@@ -21,8 +21,12 @@
 #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"