From: Martin Habets <errandir_news@mph.eclipse.co.uk>
To: David Rientjes <rientjes@google.com>
Cc: Adrian Bunk <bunk@kernel.org>,
wli@holomorphy.com, linux-kernel@vger.kernel.org,
sparclinux@vger.kernel.org
Subject: Re: sparc compile error
Date: Sun, 10 Feb 2008 15:33:55 +0000 [thread overview]
Message-ID: <20080210153355.GA6737@palantir8> (raw)
In-Reply-To: <alpine.DEB.1.00.0802071538440.15050@chino.kir.corp.google.com>
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++;
next prev parent reply other threads:[~2008-02-10 15:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-07 23:12 sparc compile error Adrian Bunk
2008-02-07 23:38 ` David Rientjes
2008-02-10 15:33 ` Martin Habets [this message]
2008-02-10 19:19 ` David Rientjes
2008-02-10 21:44 ` Robert Reif
2008-02-10 23:30 ` [patch] sparc: fix build David Rientjes
2008-02-11 9:37 ` Balbir Singh
2008-02-13 2:46 ` Andrew Morton
2008-02-13 2:57 ` Al Viro
2008-02-13 3:08 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080210153355.GA6737@palantir8 \
--to=errandir_news@mph.eclipse.co.uk \
--cc=bunk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rientjes@google.com \
--cc=sparclinux@vger.kernel.org \
--cc=wli@holomorphy.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox