The patch titled
Subject: mm/slub.c: parse slub_debug O option in switch statement
has been removed from the -mm tree. Its filename was
mm-slub-parse-slub_debug-o-option-in-switch-statement.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Chris J Arges <chris.j.arges@xxxxxxxxxxxxx>
Subject: mm/slub.c: parse slub_debug O option in switch statement
By moving the O option detection into the switch statement, we allow this
parameter to be combined with other options correctly. Previously options
like slub_debug=OFZ would only detect the 'o' and use DEBUG_DEFAULT_FLAGS
to fill in the rest of the flags.
Signed-off-by: Chris J Arges <chris.j.arges@xxxxxxxxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxx>
Acked-by: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/slub.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff -puN mm/slub.c~mm-slub-parse-slub_debug-o-option-in-switch-statement mm/slub.c
--- a/mm/slub.c~mm-slub-parse-slub_debug-o-option-in-switch-statement
+++ a/mm/slub.c
@@ -1137,15 +1137,6 @@ static int __init setup_slub_debug(char
*/
goto check_slabs;
- if (tolower(*str) == 'o') {
- /*
- * Avoid enabling debugging on caches if its minimum order
- * would increase as a result.
- */
- disable_higher_order_debug = 1;
- goto out;
- }
-
slub_debug = 0;
if (*str == '-')
/*
@@ -1176,6 +1167,13 @@ static int __init setup_slub_debug(char
case 'a':
slub_debug |= SLAB_FAILSLAB;
break;
+ case 'o':
+ /*
+ * Avoid enabling debugging on caches if its minimum
+ * order would increase as a result.
+ */
+ disable_higher_order_debug = 1;
+ break;
default:
pr_err("slub_debug option '%c' unknown. skipped\n",
*str);
_
Patches currently in -mm which might be from chris.j.arges@xxxxxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
