diff options
| author | /C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu </C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu> | 2008-09-02 09:36:31 +0000 |
|---|---|---|
| committer | /C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu </C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu> | 2008-09-02 09:36:31 +0000 |
| commit | bc2ddd2d8da1252e78a1f25bd91c1e3cd8016ead (patch) | |
| tree | b7000f7082da28ea52731df6f89fda26dfb602b6 | |
| parent | ff803076761fc7544151fcfd4e8e9a1619f2f705 (diff) | |
ChangeLog forked for kernel part + compatibility fix for kernels >= 2.6.27 added
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | kernel/ChangeLog | 4 | ||||
| -rw-r--r-- | kernel/ip_set.c | 4 |
3 files changed, 11 insertions, 0 deletions
@@ -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 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 8badef4..a525518 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> |