X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=lib%2Fgenalloc.c;h=9ce0a6a3b85ac49d2f160dda9c732ec65698f078;hb=8c33fd11e3a21a15af35b5831f1516faf53094f1;hp=d6d30d2e71664629304bc4795b533fbb89914e11;hpb=8ed693d29b25bbd88471ec043cc01581419d0481;p=powerpc.git

diff --git a/lib/genalloc.c b/lib/genalloc.c
index d6d30d2e71..9ce0a6a3b8 100644
--- a/lib/genalloc.c
+++ b/lib/genalloc.c
@@ -95,12 +95,10 @@ unsigned long gen_pool_alloc(struct gen_pool *poolp, int size)
 	if (size > max_chunk_size)
 		return 0;
 
-	i = 0;
-
 	size = max(size, 1 << ALLOC_MIN_SHIFT);
-	s = roundup_pow_of_two(size);
-
-	j = i;
+	i = fls(size - 1);
+	s = 1 << i;
+	j = i -= ALLOC_MIN_SHIFT;
 
 	spin_lock_irqsave(&poolp->lock, flags);
 	while (!h[j].next) {
@@ -153,10 +151,10 @@ void gen_pool_free(struct gen_pool *poolp, unsigned long ptr, int size)
 	if (size > max_chunk_size)
 		return;
 
-	i = 0;
-
 	size = max(size, 1 << ALLOC_MIN_SHIFT);
-	s = roundup_pow_of_two(size);
+	i = fls(size - 1);
+	s = 1 << i;
+	i -= ALLOC_MIN_SHIFT;
 
 	a = ptr;