diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-05 09:58:32 -0500 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-05 09:58:32 -0500 |
| commit | 3fd9396af83a1e69eaf9ebb573207431d8f265b6 (patch) | |
| tree | f221f5777695de71ea97423c67438bca1746e26c /lib | |
| parent | e3978cded41dc7b364e74037f56d6bc558c11fd7 (diff) | |
| parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff) | |
Merge tag 'v3.7-rc4' into upstream-master
Linux 3.7-rc4
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 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 | |||
| 178 | struct gen_pool_chunk *chunk; | 178 | struct gen_pool_chunk *chunk; |
| 179 | int nbits = size >> pool->min_alloc_order; | 179 | int nbits = size >> pool->min_alloc_order; |
| 180 | int nbytes = sizeof(struct gen_pool_chunk) + | 180 | int nbytes = sizeof(struct gen_pool_chunk) + |
| 181 | (nbits + BITS_PER_BYTE - 1) / BITS_PER_BYTE; | 181 | BITS_TO_LONGS(nbits) * sizeof(long); |
| 182 | 182 | ||
| 183 | chunk = kmalloc_node(nbytes, GFP_KERNEL | __GFP_ZERO, nid); | 183 | chunk = kmalloc_node(nbytes, GFP_KERNEL | __GFP_ZERO, nid); |
| 184 | if (unlikely(chunk == NULL)) | 184 | if (unlikely(chunk == NULL)) |