Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 6 insertions, 5 deletions

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 66e9a729f6df..c05e8edaf544 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2270,7 +2270,7 @@ void __init tcp_init(void)
                                         thash_entries,
                                         (num_physpages >= 128 * 1024) ?
                                         13 : 15,
-                                        HASH_HIGHMEM,
+                                        0,
                                         &tcp_hashinfo.ehash_size,
                                         NULL,
                                         0);
@@ -2286,7 +2286,7 @@ void __init tcp_init(void)
                                         tcp_hashinfo.ehash_size,
                                         (num_physpages >= 128 * 1024) ?
                                         13 : 15,
-                                        HASH_HIGHMEM,
+                                        0,
                                         &tcp_hashinfo.bhash_size,
                                         NULL,
                                         64 * 1024);
@@ -2316,9 +2316,10 @@ void __init tcp_init(void)
                 sysctl_max_syn_backlog = 128;
         }
 
-        sysctl_tcp_mem[0] =  768 << order;
-        sysctl_tcp_mem[1] = 1024 << order;
-        sysctl_tcp_mem[2] = 1536 << order;
+        /* Allow no more than 3/4 kernel memory (usually less) allocated to TCP */
+        sysctl_tcp_mem[0] = (1536 / sizeof (struct inet_bind_hashbucket)) << order;
+        sysctl_tcp_mem[1] = sysctl_tcp_mem[0] * 4 / 3;
+        sysctl_tcp_mem[2] = sysctl_tcp_mem[0] * 2;
 
         limit = ((unsigned long)sysctl_tcp_mem[1]) << (PAGE_SHIFT - 7);
         max_share = min(4UL*1024*1024, limit);