diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 18b5660dc2459dfb4153b97ac6acd96cfd32cc37..2983baf910f4ee0bb4bae0d1d202f633f337bc9f 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6879,7 +6879,7 @@ static int __init cgroup_memory(char *s)
 		else if (!strcmp(token, "kmem"))
 			cgroup_memory_nokmem = false;
 	}
-	return 0;
+	return 1;
 }
 __setup("cgroup.memory=", cgroup_memory);