]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mm/slub: use get_order() instead of fls()
authorWei Yang <weiyang@linux.vnet.ibm.com>
Wed, 21 Oct 2015 22:02:53 +0000 (09:02 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Oct 2015 22:02:53 +0000 (09:02 +1100)
get_order() is more easy to understand.

This patch just replaces it.

Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/slub.c

index 85fb615ade3fd7e387495dc7a9e16f0eff005783..d02fc13746470de5024cddc98e1a1130a988ac72 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3022,8 +3022,7 @@ static inline int slab_order(int size, int min_objects,
        if (order_objects(min_order, size, reserved) > MAX_OBJS_PER_PAGE)
                return get_order(size * MAX_OBJS_PER_PAGE) - 1;
 
-       for (order = max(min_order,
-                               fls(min_objects * size - 1) - PAGE_SHIFT);
+       for (order = max(min_order, get_order(min_objects * size));
                        order <= max_order; order++) {
 
                unsigned long slab_size = PAGE_SIZE << order;