summaryrefslogtreecommitdiffstats
path: root/net/ceph
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-11-20 07:46:35 +0000
committerDavid S. Miller <davem@davemloft.net>2010-11-21 10:04:04 -0800
commit7a1c8e5ab120a5f352e78bbc1fa5bb64e6f23639 (patch)
tree9c9b81e173c59d4be5590be5101c405457acab83 /net/ceph
parenta6c36ee677607b02d8ecc88e8a12785418b88107 (diff)
downloadlinux-7a1c8e5ab120a5f352e78bbc1fa5bb64e6f23639.tar.gz
linux-7a1c8e5ab120a5f352e78bbc1fa5bb64e6f23639.tar.bz2
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/ceph')
-rw-r--r--net/ceph/buffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ceph/buffer.c b/net/ceph/buffer.c
index 53d8abfa25d5..bf3e6a13c215 100644
--- a/net/ceph/buffer.c
+++ b/net/ceph/buffer.c
@@ -19,7 +19,7 @@ struct ceph_buffer *ceph_buffer_new(size_t len, gfp_t gfp)
if (b->vec.iov_base) {
b->is_vmalloc = false;
} else {
- b->vec.iov_base = __vmalloc(len, gfp, PAGE_KERNEL);
+ b->vec.iov_base = __vmalloc(len, gfp | __GFP_HIGHMEM, PAGE_KERNEL);
if (!b->vec.iov_base) {
kfree(b);
return NULL;