diff options
| author | Suraj Das <surajdazz@gmail.com> | 2017-07-28 10:05:23 +0000 |
|---|---|---|
| committer | Suraj Das <surajdazz@gmail.com> | 2017-07-28 10:05:23 +0000 |
| commit | 94a2c2973f641c53174e4bc78f3e0caff87af798 (patch) | |
| tree | 4da4b71ccd5ea8556f92c79ff430707f20af5750 /lib/genalloc.c | |
| parent | 57a6500a6977ecceed32332652cc3d60032f742d (diff) | |
| parent | 435cbe0725bdd6e41cf9df93f1e98ba1e38a5cb6 (diff) | |
Merge branch 'LA.BF64.1.2.3_rb1.14' of https://github.com/upstream-caf-kernels/msm-3.10 into n7.1n7.1
Diffstat (limited to 'lib/genalloc.c')
| -rw-r--r-- | lib/genalloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/genalloc.c b/lib/genalloc.c index d70b9687881..cc5ecb1fb6a 100644 --- a/lib/genalloc.c +++ b/lib/genalloc.c @@ -289,7 +289,7 @@ u64 gen_pool_alloc_aligned(struct gen_pool *pool, size_t size, struct gen_pool_chunk *chunk; u64 addr = 0, align_mask = 0; int order = pool->min_alloc_order; - int nbits, start_bit = 0, remain; + int nbits, start_bit, remain; #ifndef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG BUG_ON(in_nmi()); @@ -308,6 +308,7 @@ u64 gen_pool_alloc_aligned(struct gen_pool *pool, size_t size, unsigned long chunk_len; if (size > atomic_read(&chunk->avail)) continue; + start_bit = 0; chunk_len = chunk_size(chunk) >> order; retry: |