---

yaml --- r: 292674 b: refs/heads/master c: 31a7923 h: refs/heads/master v: v3
git-mirror · Mar 22, 2012 · 005c7ab · 005c7ab
1 parent 0f1f064
commit 005c7ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 052b1987faca3606109d88d96bce124851f7c4c2
+refs/heads/master: 31a79235fc75b506e282e43723107a40f3bc5c07
diff --git a/trunk/include/linux/memcontrol.h b/trunk/include/linux/memcontrol.h
@@ -392,7 +392,7 @@ static inline void mem_cgroup_replace_page_cache(struct page *oldpage,
 				struct page *newpage)
 {
 }
-#endif /* CONFIG_CGROUP_MEM_CONT */
+#endif /* CONFIG_CGROUP_MEM_RES_CTLR */
 
 #if !defined(CONFIG_CGROUP_MEM_RES_CTLR) || !defined(CONFIG_DEBUG_VM)
 static inline bool