Merge branch 'devel/debug_ll_init' into next/multiplatform

* devel/debug_ll_init:
  ARM: implement debug_ll_io_init()
  + sync to Linux 3.7-rc4

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/genalloc.c b/lib/genalloc.c
index ca208a92628c..54920433705a 100644
--- a/lib/genalloc.c
+++ b/lib/genalloc.c
@@ -178,7 +178,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))