The patch titled Subject: mm/ksm: move [set_]page_stable_node from ksm.h to ksm.c has been added to the -mm tree. Its filename is mm-ksm-move-page_stable_node-from-ksmh-to-ksmc.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-ksm-move-page_stable_node-from-ksmh-to-ksmc.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-ksm-move-page_stable_node-from-ksmh-to-ksmc.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/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx> Subject: mm/ksm: move [set_]page_stable_node from ksm.h to ksm.c page_stable_node() and set_page_stable_node() are only used in mm/ksm.c and there is no point to keep them in the include/linux/ksm.h Link: http://lkml.kernel.org/r/1524552106-7356-3-git-send-email-rppt@xxxxxxxxxxxxxxxxxx Signed-off-by: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx> Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/ksm.h | 11 ----------- mm/ksm.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) diff -puN include/linux/ksm.h~mm-ksm-move-page_stable_node-from-ksmh-to-ksmc include/linux/ksm.h --- a/include/linux/ksm.h~mm-ksm-move-page_stable_node-from-ksmh-to-ksmc +++ a/include/linux/ksm.h @@ -37,17 +37,6 @@ static inline void ksm_exit(struct mm_st __ksm_exit(mm); } -static inline struct stable_node *page_stable_node(struct page *page) -{ - return PageKsm(page) ? page_rmapping(page) : NULL; -} - -static inline void set_page_stable_node(struct page *page, - struct stable_node *stable_node) -{ - page->mapping = (void *)((unsigned long)stable_node | PAGE_MAPPING_KSM); -} - /* * When do_swap_page() first faults in from swap what used to be a KSM page, * no problem, it will be assigned to this vma's anon_vma; but thereafter, diff -puN mm/ksm.c~mm-ksm-move-page_stable_node-from-ksmh-to-ksmc mm/ksm.c --- a/mm/ksm.c~mm-ksm-move-page_stable_node-from-ksmh-to-ksmc +++ a/mm/ksm.c @@ -827,6 +827,18 @@ static int unmerge_ksm_pages(struct vm_a /* * Only called through the sysfs control interface: */ + +static inline struct stable_node *page_stable_node(struct page *page) +{ + return PageKsm(page) ? page_rmapping(page) : NULL; +} + +static inline void set_page_stable_node(struct page *page, + struct stable_node *stable_node) +{ + page->mapping = (void *)((unsigned long)stable_node | PAGE_MAPPING_KSM); +} + static int remove_stable_node(struct stable_node *stable_node) { struct page *page; _ Patches currently in -mm which might be from rppt@xxxxxxxxxxxxxxxxxx are mm-ksm-remove-unused-page_referenced_ksm-declaration.patch mm-ksm-move-page_stable_node-from-ksmh-to-ksmc.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