Re: mmotm-2010-0428: swapper_space error

[Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>]

On Thu, 6 May 2010 13:42:48 +0900, Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> wrote:
> sorry...
> 
> I'll re-check my build test script and prepare a patch as soon as possible.
> 
This is a fix for memcg-move-charge-of-file-pages.patch.

After this patch, it passed the build test for all the configs with possible
combinations of SWAP, SHMEM, MEM_RES_CTLR and MEM_RES_CTLR_SWAP.

===
From: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>

Build fix for !CONFIG_SWAP case.

mm/built-in.o: In function `mem_cgroup_get_shmem_target':
(.text+0xde06): undefined reference to `swapper_space'

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
---
 mm/shmem.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/mm/shmem.c b/mm/shmem.c
index 6f183ef..6517bbd 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2591,10 +2591,12 @@ void mem_cgroup_get_shmem_target(struct inode *inode, pgoff_t pgoff,
 
 	spin_lock(&info->lock);
 	ptr = shmem_swp_entry(info, pgoff, NULL);
+#ifdef CONFIG_SWAP
 	if (ptr && ptr->val) {
 		entry.val = ptr->val;
 		page = find_get_page(&swapper_space, entry.val);
 	} else
+#endif
 		page = find_get_page(inode->i_mapping, pgoff);
 	if (ptr)
 		shmem_swp_unmap(ptr);
-- 
1.6.5.2