diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-24 08:22:34 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-24 08:22:34 +0900 |
| commit | 3cbaa0f7a78d3b970b566629ee298c310780b919 (patch) | |
| tree | 5b392ab5d59cfd87d7a6869ab6681a63d14e7d04 /net/ceph | |
| parent | e94571653876922bbc247c8ef13c0b7839c3e503 (diff) | |
| parent | cf41a51db89850033efc11c18a5257de810b5417 (diff) | |
| download | linux-3.10-3cbaa0f7a78d3b970b566629ee298c310780b919.tar.gz linux-3.10-3cbaa0f7a78d3b970b566629ee298c310780b919.tar.bz2 linux-3.10-3cbaa0f7a78d3b970b566629ee298c310780b919.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
of/phylib: Use device tree properties to initialize Marvell PHYs.
phylib: Add support for Marvell 88E1149R devices.
phylib: Use common page register definition for Marvell PHYs.
qlge: Fix incorrect usage of module parameters and netdev msg level
ipv6: fix missing in6_ifa_put in addrconf
SuperH IrDA: correct Baud rate error correction
atl1c: Fix hardware type check for enabling OTP CLK
net: allow GFP_HIGHMEM in __vmalloc()
bonding: change list contact to netdev@vger.kernel.org
e1000: fix screaming IRQ
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ceph/buffer.c b/net/ceph/buffer.c index 53d8abfa25d..bf3e6a13c21 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; |