The patch titled
Subject: ksm-count-ksm-merging-pages-for-each-process-fix
has been added to the -mm tree. Its filename is
ksm-count-ksm-merging-pages-for-each-process-fix.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/ksm-count-ksm-merging-pages-for-each-process-fix.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/ksm-count-ksm-merging-pages-for-each-process-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: ksm-count-ksm-merging-pages-for-each-process-fix
fix comment typo, remove BUG_ON()s
Cc: kernel test robot <lkp@xxxxxxxxx>
Cc: Ran Xiaokai <ran.xiaokai@xxxxxxxxxx>
Cc: xu xin <xu.xin16@xxxxxxxxxx>
Cc: Yang Yang <yang.yang29@xxxxxxxxxx>
Cc: Zeal Robot <zealci@xxxxxxxxxx>
Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Feng Tang <feng.tang@xxxxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Cc: Ohhoon Kwon <ohoono.kwon@xxxxxxxxxxx>
Cc: Stephen Brennan <stephen.s.brennan@xxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/mm_types.h | 4 ++--
mm/ksm.c | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
--- a/include/linux/mm_types.h~ksm-count-ksm-merging-pages-for-each-process-fix
+++ a/include/linux/mm_types.h
@@ -658,8 +658,8 @@ struct mm_struct {
#ifdef CONFIG_KSM
/*
- * Represet how many pages of this process are
- * involved in KSM merging.
+ * Represent how many pages of this process are involved in KSM
+ * merging.
*/
unsigned long ksm_merging_pages;
#endif
--- a/mm/ksm.c~ksm-count-ksm-merging-pages-for-each-process-fix
+++ a/mm/ksm.c
@@ -639,7 +639,6 @@ static void remove_node_from_stable_tree
else
ksm_pages_shared--;
- BUG_ON(rmap_item->mm == NULL);
rmap_item->mm->ksm_merging_pages--;
VM_BUG_ON(stable_node->rmap_hlist_len <= 0);
@@ -790,7 +789,6 @@ static void remove_rmap_item_from_tree(s
else
ksm_pages_shared--;
- BUG_ON(rmap_item->mm == NULL);
rmap_item->mm->ksm_merging_pages--;
VM_BUG_ON(stable_node->rmap_hlist_len <= 0);
@@ -2016,7 +2014,6 @@ static void stable_tree_append(struct rm
else
ksm_pages_shared++;
- BUG_ON(rmap_item->mm == NULL);
rmap_item->mm->ksm_merging_pages++;
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm.patch
mm-mempolicy-convert-from-atomic_t-to-refcount_t-on-mempolicy-refcnt-fix.patch
ksm-count-ksm-merging-pages-for-each-process-fix.patch
linux-next-rejects.patch
mm-oom_killc-fix-vm_oom_kill_table-ifdeffery.patch
mutex-subsystem-synchro-test-module-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
