diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-11-03 08:06:50 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-11-03 08:06:50 -0400 |
| commit | 0c0867b5e16def1aa2ff0c78b7d2f463fef72421 (patch) | |
| tree | 5c6c013856ce30c4ae4007a3052417a923cfd278 /lib | |
| parent | cbced358ac79dfeea8ec0be224edb6087730b112 (diff) | |
| parent | e796c78c404fbe3423d981b6ef056e04b1e4b078 (diff) | |
Merge tag 'v3.2.33' into v3.2-rt
This is the 3.2.33 stable release
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/genalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/genalloc.c b/lib/genalloc.c index f352cc42f4f8..716f94747c81 100644 --- a/lib/genalloc.c +++ b/lib/genalloc.c @@ -176,7 +176,7 @@ int gen_pool_add_virt(struct gen_pool *pool, unsigned long virt, phys_addr_t phy struct gen_pool_chunk *chunk; int nbits = size >> pool->min_alloc_order; int nbytes = sizeof(struct gen_pool_chunk) + - (nbits + BITS_PER_BYTE - 1) / BITS_PER_BYTE; + BITS_TO_LONGS(nbits) * sizeof(long); chunk = kmalloc_node(nbytes, GFP_KERNEL | __GFP_ZERO, nid); if (unlikely(chunk == NULL)) |