This still gives build errors with CGROUP_MEM_CONT off.
Some ifdef-ing will fix that.
Martin
Signed-off-by: Martin Habets <errandir_news@xxxxxxxxxxxxxxxxx>
Index: sparc-2.6.git/mm/rmap.c
===================================================================
--- sparc-2.6.git.orig/mm/rmap.c 2008-02-10 13:01:37.000000000 +0000
+++ sparc-2.6.git/mm/rmap.c 2008-02-10 14:16:34.000000000 +0000
@@ -321,8 +321,11 @@
* counting on behalf of references from different
* cgroups
*/
- if (mem_cont && (mm_cgroup(vma->vm_mm) != mem_cont))
+#ifdef CONFIG_CGROUP_MEM_CONT
+ if (mem_cont && mem_cont !=
+ rcu_dereference(vma->vm_mm->mem_cgroup))
continue;
+#endif
referenced += page_referenced_one(page, vma, &mapcount);
if (!mapcount)
break;
@@ -382,8 +385,11 @@
* counting on behalf of references from different
* cgroups
*/
- if (mem_cont && (mm_cgroup(vma->vm_mm) != mem_cont))
+#ifdef CONFIG_CGROUP_MEM_CONT
+ if (mem_cont && mem_cont !=
+ rcu_dereference(vma->vm_mm->mem_cgroup))
continue;
+#endif
if ((vma->vm_flags & (VM_LOCKED|VM_MAYSHARE))
== (VM_LOCKED|VM_MAYSHARE)) {
referenced++;
-
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
