Home » Mailing list archives » linux-kernel » 2008 » February » 10

Re: sparc compile error

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Martin Habets <errandir_news@...>
To: David Rientjes <rientjes@...>
Cc: Adrian Bunk <bunk@...>, <wli@...>, <linux-kernel@...>, <sparclinux@...>
Subject: Re: sparc compile error
Date: Sunday, February 10, 2008 - 11:33 am

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++;
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
sparc compile error, Adrian Bunk, (Thu Feb 7, 7:12 pm)
Re: sparc compile error, David Rientjes, (Thu Feb 7, 7:38 pm)
Re: sparc compile error, Martin Habets, (Sun Feb 10, 11:33 am)
Re: sparc compile error, David Rientjes, (Sun Feb 10, 3:19 pm)
Re: sparc compile error, Robert Reif, (Sun Feb 10, 5:44 pm)
[patch] sparc: fix build, David Rientjes, (Sun Feb 10, 7:30 pm)
Re: [patch] sparc: fix build, Andrew Morton, (Tue Feb 12, 10:46 pm)
Re: [patch] sparc: fix build, Al Viro, (Tue Feb 12, 10:57 pm)
Re: [patch] sparc: fix build, Andrew Morton, (Tue Feb 12, 11:08 pm)
Re: [patch] sparc: fix build, Balbir Singh, (Mon Feb 11, 5:37 am)