aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/request_sock.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-12-08 13:15:38 -0800
committerDavid S. Miller <davem@davemloft.net>2010-12-08 13:47:38 -0800
commitfe6c791570efe717946ea7b7dd50aec96b70d551 (patch)
tree1becb5e8aea7a9c9a7d78f987bd73b0a5d8ee434 /net/core/request_sock.c
parentf8bf5681cf15f77692c8ad8cb95d059ff7c622c9 (diff)
parentf19872575ff7819a3723154657a497d9bca66b33 (diff)
downloadkernel_samsung_aries-fe6c791570efe717946ea7b7dd50aec96b70d551.zip
kernel_samsung_aries-fe6c791570efe717946ea7b7dd50aec96b70d551.tar.gz
kernel_samsung_aries-fe6c791570efe717946ea7b7dd50aec96b70d551.tar.bz2
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/ath/ath9k/ar9003_eeprom.c net/llc/af_llc.c
Diffstat (limited to 'net/core/request_sock.c')
-rw-r--r--net/core/request_sock.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/core/request_sock.c b/net/core/request_sock.c
index 41d9943..182236b 100644
--- a/net/core/request_sock.c
+++ b/net/core/request_sock.c
@@ -46,9 +46,7 @@ int reqsk_queue_alloc(struct request_sock_queue *queue,
nr_table_entries = roundup_pow_of_two(nr_table_entries + 1);
lopt_size += nr_table_entries * sizeof(struct request_sock *);
if (lopt_size > PAGE_SIZE)
- lopt = __vmalloc(lopt_size,
- GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
- PAGE_KERNEL);
+ lopt = vzalloc(lopt_size);
else
lopt = kzalloc(lopt_size, GFP_KERNEL);
if (lopt == NULL)