X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=mm%2Fslub.c;h=65ffda5934b09b8220e9a00332945dc19ba88de6;hb=963118eef9e6706e2b5356309fb0cdd9c9eba81d;hp=aa34913a41eadb9c898069e2dff076f1f6c0826b;hpb=1eb5ac6466d4be7b15b38ce3ab709600f1bc891f;p=firefly-linux-kernel-4.4.55.git

diff --git a/mm/slub.c b/mm/slub.c
index aa34913a41ea..65ffda5934b0 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1912,7 +1912,7 @@ static inline int calculate_order(int size)
 	 * Doh this slab cannot be placed using slub_max_order.
 	 */
 	order = slab_order(size, 1, MAX_ORDER, 1);
-	if (order <= MAX_ORDER)
+	if (order < MAX_ORDER)
 		return order;
 	return -ENOSYS;
 }
@@ -2525,6 +2525,7 @@ __setup("slub_min_order=", setup_slub_min_order);
 static int __init setup_slub_max_order(char *str)
 {
 	get_option(&str, &slub_max_order);
+	slub_max_order = min(slub_max_order, MAX_ORDER - 1);
 
 	return 1;
 }