diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-11-02 22:02:55 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-11-02 22:02:55 -0400 |
| commit | 0142da417d4b69a3da775c0e84c1583004c76db7 (patch) | |
| tree | 504c450d298f9657156b126e36c94d6356056c39 /lib | |
| parent | 9d0b1472d4ca3a1b93adc62e928160db418e93dd (diff) | |
| parent | 5390967b2f98e6aa46f20eae09580e7db73826b9 (diff) | |
Merge tag 'v3.4.17' into v3.4-rt
This is the 3.4.17 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 6bc04aab6ec7..7cb7a5dac09b 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)) |