Re: mmotm-2010-0428: swapper_space error

[Randy Dunlap]

On Thu, 6 May 2010 14:57:58 +0900 Daisuke Nishimura wrote:

> On Thu, 6 May 2010 13:42:48 +0900, Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxxx>
> 
> 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@xxxxxxxxxxxx>
> Signed-off-by: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>

Yes, that works.  Thanks.
Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>


> ---
>  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
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/