The patch titled
memcg: handle swap caches build fix
has been added to the -mm tree. Its filename is
memcg-handle-swap-caches-build-fix.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: handle swap caches build fix
From: Hugh Dickins <hugh@xxxxxxxxxxx>
Fix to build error when CONFIG_SHMEM=y but CONFIG_SWAP is not set:
mm/shmem.c: In function â??shmem_unuse_inodeâ??:
mm/shmem.c:927: error: implicit declaration of function â??mem_cgroup_cache_charge_swapinâ??
Yes, there's a lot of code in mm/shmem.c which only comes into play when
CONFIG_SWAP=y: better than this quick fix would be to restructure shmem.c
with all swap stuff in a separate file; that's on my mind, but now is not
the moment for it.
Signed-off-by: Hugh Dickins <hugh@xxxxxxxxxxx>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/swap.h | 6 ++++++
1 file changed, 6 insertions(+)
diff -puN include/linux/swap.h~memcg-handle-swap-caches-build-fix include/linux/swap.h
--- a/include/linux/swap.h~memcg-handle-swap-caches-build-fix
+++ a/include/linux/swap.h
@@ -434,6 +434,12 @@ static inline swp_entry_t get_swap_page(
#define has_swap_token(x) 0
#define disable_swap_token() do { } while(0)
+static inline int mem_cgroup_cache_charge_swapin(struct page *page,
+ struct mm_struct *mm, gfp_t mask, bool locked)
+{
+ return 0;
+}
+
#endif /* CONFIG_SWAP */
#endif /* __KERNEL__*/
#endif /* _LINUX_SWAP_H */
_
Patches currently in -mm which might be from hugh@xxxxxxxxxxx are
origin.patch
lib-scatterlistc-fix-kunmap-argument-in-sg_miter_stop.patch
linux-next.patch
sprint_symbol-use-less-stack.patch
migration-fix-writepage-error.patch
vmscan-let-gfp_nofs-go-to-swap-again.patch
dont-unlink-an-active-swapfile.patch
mm-remove-unevictables-show_page_path.patch
mm-dont-mark_page_accessed-in-shmem_fault.patch
mm-apply_to_range-call-pte-function-with-lazy-updates.patch
memcg-handle-swap-caches.patch
memcg-handle-swap-caches-build-fix.patch
memcg-memswap-controller-core.patch
prio_tree-debugging-patch.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
