The patch titled Subject: mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix has been added to the -mm tree. Its filename is mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-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/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: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix fix SYSFS=n build Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx> Cc: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx> Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/ksm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff -puN mm/ksm.c~mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix mm/ksm.c --- a/mm/ksm.c~mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix +++ a/mm/ksm.c @@ -823,11 +823,6 @@ static int unmerge_ksm_pages(struct vm_a return err; } -#ifdef CONFIG_SYSFS -/* - * 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; @@ -839,6 +834,10 @@ static inline void set_page_stable_node( page->mapping = (void *)((unsigned long)stable_node | PAGE_MAPPING_KSM); } +#ifdef CONFIG_SYSFS +/* + * Only called through the sysfs control interface: + */ static int remove_stable_node(struct stable_node *stable_node) { struct page *page; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch z3fold-fix-reclaim-lock-ups-checkpatch-fixes.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch mm.patch zram-introduce-zram-memory-tracking-fix.patch zram-introduce-zram-memory-tracking-update-fix.patch zram-introduce-zram-memory-tracking-update-fix-fix.patch mm-check-for-sigkill-inside-dup_mmap-loop-fix.patch mm-vmalloc-pass-proper-vm_start-into-debugobjects-fix.patch mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix.patch mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix.patch mm-memcontrolc-add-mem_cgroup_from_task-as-a-local-helper.patch list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch mm-oom-cgroup-aware-oom-killer-fix.patch mm-oom-cgroup-aware-oom-killer-fix-2.patch mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch mm-oom-cgroup-aware-oom-killer-fix-fix.patch proc-simpler-iterations-for-proc-cmdline-fix.patch ida-remove-simple_ida_lock-fix.patch kcov-prefault-the-kcov_area-fix.patch kcov-prefault-the-kcov_area-fix-fix.patch kcov-prefault-the-kcov_area-fix-fix-fix.patch linux-next-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.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