The patch titled
memcg-move-charge-of-file-pages-fix-3
has been added to the -mm tree. Its filename is
memcg-move-charge-of-file-pages-fix-3.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: memcg-move-charge-of-file-pages-fix-3
Build fix for !CONFIG_SWAP case.
mm/built-in.o: In function `mem_cgroup_get_shmem_target':
(.text+0xde06): undefined reference to `swapper_space'
Signed-off-by: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>
Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/shmem.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN mm/shmem.c~memcg-move-charge-of-file-pages-fix-3 mm/shmem.c
--- a/mm/shmem.c~memcg-move-charge-of-file-pages-fix-3
+++ a/mm/shmem.c
@@ -2591,10 +2591,12 @@ void mem_cgroup_get_shmem_target(struct
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);
_
Patches currently in -mm which might be from nishimura@xxxxxxxxxxxxxxxxx are
linux-next.patch
memcg-oom-wakeup-filter.patch
memcg-oom-wakeup-filter-update.patch
memcg-oom-notifier.patch
memcg-oom-notifier-update.patch
memcg-oom-kill-disable-and-oom-status.patch
memcg-oom-kill-disable-and-oom-status-update.patch
memcg-clean-up-move-charge.patch
memcg-move-charge-of-file-pages.patch
memcg-move-charge-of-file-pages-fix.patch
memcg-move-charge-of-file-pages-fix-2.patch
memcg-move-charge-of-file-pages-fix-3.patch
memcg-update-documentation-v8.patch
memcg-rcu-lock-fix-v3.patch
memcg-make-oom-killer-a-no-op-when-no-killable-task-can-be-found.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
