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/xfrm/xfrm_hash.c | |
| parent | a6c36ee677607b02d8ecc88e8a12785418b88107 (diff) | |
| download | op-kernel-dev-7a1c8e5ab120a5f352e78bbc1fa5bb64e6f23639.zip op-kernel-dev-7a1c8e5ab120a5f352e78bbc1fa5bb64e6f23639.tar.gz | |
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/xfrm/xfrm_hash.c')
| -rw-r--r-- | net/xfrm/xfrm_hash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_hash.c b/net/xfrm/xfrm_hash.c index a2023ec..1e98bc0 100644 --- a/net/xfrm/xfrm_hash.c +++ b/net/xfrm/xfrm_hash.c @@ -19,7 +19,7 @@ struct hlist_head *xfrm_hash_alloc(unsigned int sz) if (sz <= PAGE_SIZE) n = kzalloc(sz, GFP_KERNEL); else if (hashdist) - n = __vmalloc(sz, GFP_KERNEL | __GFP_ZERO, PAGE_KERNEL); + n = vzalloc(sz); else n = (struct hlist_head *) __get_free_pages(GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO, |
