diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 17398e7601f6cd2cc8ac822b5d98e6f8b6cf6feb..416a608939f57593073d4337a03eeb35508265d7 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -7058,7 +7058,7 @@ static int __init cgroup_memory(char *s)
 		if (!strcmp(token, "nokmem"))
 			cgroup_memory_nokmem = true;
 	}
-	return 0;
+	return 1;
 }
 __setup("cgroup.memory=", cgroup_memory);