| From: Andrew Morton <akpm@linux-foundation.org> |
| Subject: ksm-count-ksm-merging-pages-for-each-process-fix |
| |
| fix comment typo, remove BUG_ON()s |
| |
| Cc: kernel test robot <lkp@intel.com> |
| Cc: Ran Xiaokai <ran.xiaokai@zte.com.cn> |
| Cc: xu xin <xu.xin16@zte.com.cn> |
| Cc: Yang Yang <yang.yang29@zte.com.cn> |
| Cc: Zeal Robot <zealci@zte.com.cn> |
| Cc: Alexey Dobriyan <adobriyan@gmail.com> |
| Cc: Feng Tang <feng.tang@intel.com> |
| Cc: Kees Cook <keescook@chromium.org> |
| Cc: Matthew Wilcox (Oracle) <willy@infradead.org> |
| Cc: Ohhoon Kwon <ohoono.kwon@samsung.com> |
| Cc: Stephen Brennan <stephen.s.brennan@oracle.com> |
| Cc: Stephen Rothwell <sfr@canb.auug.org.au> |
| Cc: Vlastimil Babka <vbabka@suse.cz> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| 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 |
| @@ -657,8 +657,8 @@ struct mm_struct { |
| #endif |
| #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); |
| @@ -2027,7 +2025,6 @@ static void stable_tree_append(struct rm |
| else |
| ksm_pages_shared++; |
| |
| - BUG_ON(rmap_item->mm == NULL); |
| rmap_item->mm->ksm_merging_pages++; |
| } |
| |
| _ |