Message ID | 1234416153.2604.387.camel@ymzhang |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
diff -Nraup linux-2.6.29-rc2/mm/slub.c linux-2.6.29-rc2_slubcalc_order/mm/slub.c --- linux-2.6.29-rc2/mm/slub.c 2009-02-11 00:49:48.000000000 -0500 +++ linux-2.6.29-rc2_slubcalc_order/mm/slub.c 2009-02-12 00:08:24.000000000 -0500 @@ -1856,6 +1856,7 @@ static inline int calculate_order(int si min_objects = slub_min_objects; if (!min_objects) min_objects = 4 * (fls(nr_cpu_ids) + 1); + min_objects = min(min_objects, (PAGE_SIZE << slub_max_order)/size); while (min_objects > 1) { fraction = 16; while (fraction >= 4) { @@ -1865,7 +1866,7 @@ static inline int calculate_order(int si return order; fraction /= 2; } - min_objects /= 2; + min_objects --; } /*