[PATCH] mm: memcontrol: fix handling of swapaccount parameter

From: Gergely Risko
Date: Wed Aug 14 2013 - 09:54:16 EST


Fixed swap accounting option parsing to enable if called without argument.

Signed-off-by: Gergely Risko <gergely@xxxxxxxx>
---
mm/memcontrol.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index c290a1c..8ec2507 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6970,13 +6970,13 @@ struct cgroup_subsys mem_cgroup_subsys = {
static int __init enable_swap_account(char *s)
{
/* consider enabled if no parameter or 1 is given */
- if (!strcmp(s, "1"))
+ if (*s++ != '=' || !*s || !strcmp(s, "1"))
really_do_swap_account = 1;
else if (!strcmp(s, "0"))
really_do_swap_account = 0;
return 1;
}
-__setup("swapaccount=", enable_swap_account);
+__setup("swapaccount", enable_swap_account);

static void __init memsw_file_init(void)
{
--
1.8.3.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/