Messages in this thread Patch in this message | | | Date | Sun, 10 Feb 2008 15:33:55 +0000 | From | Martin Habets <> | Subject | Re: sparc compile error |
| |
This still gives build errors with CGROUP_MEM_CONT off. Some ifdef-ing will fix that.
Martin
Signed-off-by: Martin Habets <errandir_news@mph.eclipse.co.uk>
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++;
| |