From: /C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu </C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu>
Date: Tue, 2 Sep 2008 09:36:31 +0000 (+0000)
Subject: ChangeLog forked for kernel part + compatibility fix for kernels >= 2.6.27 added
X-Git-Tag: v2.4.6~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc2ddd2d8da1252e78a1f25bd91c1e3cd8016ead;p=thirdparty%2Fipset.git

ChangeLog forked for kernel part + compatibility fix for kernels >= 2.6.27 added
---

diff --git a/ChangeLog b/ChangeLog
index 409adab5..7d66ebe6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Tue, 02 Sep 2008
+	- ChangeLog forked for kernel part
+
 2.3.3a
  - Fix to compile ipset with 2.4.26.x tree statically (bug reported by
    G.W. Haywood)
diff --git a/kernel/ChangeLog b/kernel/ChangeLog
new file mode 100644
index 00000000..c0207139
--- /dev/null
+++ b/kernel/ChangeLog
@@ -0,0 +1,4 @@
+Tue, 02 Sep 2008
+	- ChangeLog forked for kernel part
+	- Compatibility fix for kernels >= 2.6.27:
+	  semaphore.h was moved from asm/ to linux/ (James King)
diff --git a/kernel/ip_set.c b/kernel/ip_set.c
index 8badef45..a525518f 100644
--- a/kernel/ip_set.c
+++ b/kernel/ip_set.c
@@ -24,7 +24,11 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 #include <asm/bitops.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
 #include <asm/semaphore.h>
+#else
+#include <linux/semaphore.h>
+#endif
 #include <linux/spinlock.h>
 #include <linux/vmalloc.h>