diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-31 22:54:11 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-31 22:54:11 +0100 |
| commit | cb65a3eb390b7cc995c4aa6b7bff32a4696242e6 (patch) | |
| tree | 9a8a12cc439b49e5fc60283c5f9008e8beb47cec /lib | |
| parent | 2e8a7ef975522bc50b765f07ff297b09709515f0 (diff) | |
| parent | 27d0858dbcf199838b8c50a3e94d397bf326d986 (diff) | |
| download | kernel_samsung_crespo-cb65a3eb390b7cc995c4aa6b7bff32a4696242e6.zip kernel_samsung_crespo-cb65a3eb390b7cc995c4aa6b7bff32a4696242e6.tar.gz kernel_samsung_crespo-cb65a3eb390b7cc995c4aa6b7bff32a4696242e6.tar.bz2 | |
Merge kernel.org linux-3.0.y into HEAD
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 577ddf8..cbb294c 100644 --- a/lib/genalloc.c +++ b/lib/genalloc.c @@ -57,7 +57,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)) |