LU-502 don't allow to kill service threads by OOM killer.

[fs/lustre-release.git] / lnet / klnds / socklnd / socklnd_lib-linux.h

diff --git a/lnet/klnds/socklnd/socklnd_lib-linux.h b/lnet/klnds/socklnd/socklnd_lib-linux.h
index 610c949..494ce8e 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_lib-linux.h
+++ b/lnet/klnds/socklnd/socklnd_lib-linux.h
@@ -71,10 +71,7 @@
 #include <linux/sysctl.h>
 #include <asm/uaccess.h>
 #include <asm/div64.h>
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-# include <linux/syscalls.h>
-#endif
+#include <linux/syscalls.h>
 
 #include <libcfs/libcfs.h>
 #include <libcfs/linux/portals_compat25.h>
@@ -91,13 +88,8 @@ static inline __u32 ksocknal_csum(__u32 crc, unsigned char const *p, size_t len)
 #endif
 }
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,7))
-# define SOCKNAL_WSPACE(sk)       sk_stream_wspace(sk)
-# define SOCKNAL_MIN_WSPACE(sk)   sk_stream_min_wspace(sk)
-#else
-# define SOCKNAL_WSPACE(sk)     tcp_wspace(sk)
-# define SOCKNAL_MIN_WSPACE(sk) (((sk)->sk_sndbuf*8)/10)
-#endif
+#define SOCKNAL_WSPACE(sk)       sk_stream_wspace(sk)
+#define SOCKNAL_MIN_WSPACE(sk)   sk_stream_min_wspace(sk)
 
 #ifndef CONFIG_SMP
 static inline