r7563 - in trunk/ipset: . kernel

kadlec at blackhole.kfki.hu kadlec at blackhole.kfki.hu
Tue Sep 2 11:36:31 CEST 2008


Author: kadlec at blackhole.kfki.hu
Date: 2008-09-02 11:36:31 +0200 (Tue, 02 Sep 2008)
New Revision: 7563

Added:
   trunk/ipset/kernel/ChangeLog
Modified:
   trunk/ipset/ChangeLog
   trunk/ipset/kernel/ip_set.c
Log:
ChangeLog forked for kernel part + compatibility fix for kernels >= 2.6.27 added


Modified: trunk/ipset/ChangeLog
===================================================================
--- trunk/ipset/ChangeLog	2008-08-15 20:18:58 UTC (rev 7562)
+++ trunk/ipset/ChangeLog	2008-09-02 09:36:31 UTC (rev 7563)
@@ -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)

Added: trunk/ipset/kernel/ChangeLog
===================================================================
--- trunk/ipset/kernel/ChangeLog	                        (rev 0)
+++ trunk/ipset/kernel/ChangeLog	2008-09-02 09:36:31 UTC (rev 7563)
@@ -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)

Modified: trunk/ipset/kernel/ip_set.c
===================================================================
--- trunk/ipset/kernel/ip_set.c	2008-08-15 20:18:58 UTC (rev 7562)
+++ trunk/ipset/kernel/ip_set.c	2008-09-02 09:36:31 UTC (rev 7563)
@@ -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>
 




More information about the netfilter-cvslog mailing list