diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-11-20 07:46:35 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-21 10:04:04 -0800 |
| commit | 7a1c8e5ab120a5f352e78bbc1fa5bb64e6f23639 (patch) | |
| tree | 9c9b81e173c59d4be5590be5101c405457acab83 /net/core | |
| parent | a6c36ee677607b02d8ecc88e8a12785418b88107 (diff) | |
| download | talos-op-linux-7a1c8e5ab120a5f352e78bbc1fa5bb64e6f23639.tar.gz talos-op-linux-7a1c8e5ab120a5f352e78bbc1fa5bb64e6f23639.zip | |
net: allow GFP_HIGHMEM in __vmalloc()
We forgot to use __GFP_HIGHMEM in several __vmalloc() calls.
In ceph, add the missing flag.
In fib_trie.c, xfrm_hash.c and request_sock.c, using vzalloc() is
cleaner and allows using HIGHMEM pages as well.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/request_sock.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/core/request_sock.c b/net/core/request_sock.c index 7552495aff7a..fceeb37d7161 100644 --- a/net/core/request_sock.c +++ b/net/core/request_sock.c @@ -45,9 +45,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) |
