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

diff --git a/ChangeLog b/ChangeLog
index 409adab50f836e311421cc343fa47b33e3503e51..7d66ebe66351fe0f1670ab0fbcd1b704d9769537 100644 (file)
--- 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 (file)
index 0000000..c020713
--- /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 8badef4513c27aa3d97d8a5229fe33334991537d..a525518f963add14b7b3180cfef80b68880c0f3b 100644 (file)
--- 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>