---

yaml --- r: 232721 b: refs/heads/master c: fceda1b h: refs/heads/master i: 232719: ef56c15 v: v3
git-mirror · Feb 3, 2011 · 0e59279 · 0e59279
1 parent d5a88b3
commit 0e59279
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afe8a887550f7cc24eb16449670b93f6b43c32d8
+refs/heads/master: fceda1bf498677501befc7da72fd2e4de7f18466
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -5024,17 +5024,17 @@ struct cgroup_subsys mem_cgroup_subsys = {
 static int __init enable_swap_account(char *s)
 {
 	/* consider enabled if no parameter or 1 is given */
-	if (!s || !strcmp(s, "1"))
+	if (!(*s) || !strcmp(s, "=1"))
 		really_do_swap_account = 1;
-	else if (!strcmp(s, "0"))
+	else if (!strcmp(s, "=0"))
 		really_do_swap_account = 0;
 	return 1;
 }
 __setup("swapaccount", enable_swap_account);
 
 static int __init disable_swap_account(char *s)
 {
-	enable_swap_account("0");
+	enable_swap_account("=0");
 	return 1;
 }
 __setup("noswapaccount", disable_swap_account);