diff options
author | Wei Yang <weiyang@linux.vnet.ibm.com> | 2015-11-05 21:45:48 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 22:34:48 -0500 |
commit | 033fd1bd3c50fdda267d27d02f9bc656f0b9ddb8 (patch) | |
tree | 74b742a65bc35c7a5aba4189c988f6ca621f1d4e | |
parent | 422ff4d70c1b3b2deed431dc095432dc691f4269 (diff) |
mm/slub: use get_order() instead of fls()
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: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | mm/slub.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -2912,8 +2912,7 @@ static inline int slab_order(int size, int min_objects, | |||
2912 | if (order_objects(min_order, size, reserved) > MAX_OBJS_PER_PAGE) | 2912 | if (order_objects(min_order, size, reserved) > MAX_OBJS_PER_PAGE) |
2913 | return get_order(size * MAX_OBJS_PER_PAGE) - 1; | 2913 | return get_order(size * MAX_OBJS_PER_PAGE) - 1; |
2914 | 2914 | ||
2915 | for (order = max(min_order, | 2915 | for (order = max(min_order, get_order(min_objects * size)); |
2916 | fls(min_objects * size - 1) - PAGE_SHIFT); | ||
2917 | order <= max_order; order++) { | 2916 | order <= max_order; order++) { |
2918 | 2917 | ||
2919 | unsigned long slab_size = PAGE_SIZE << order; | 2918 | unsigned long slab_size = PAGE_SIZE << order; |