The patch titled
Subject: mm-reuse-only-pte-mapped-ksm-page-in-do_wp_page-fix
has been removed from the -mm tree. Its filename was
mm-reuse-only-pte-mapped-ksm-page-in-do_wp_page-fix.patch
This patch was dropped because it was folded into mm-reuse-only-pte-mapped-ksm-page-in-do_wp_page.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-reuse-only-pte-mapped-ksm-page-in-do_wp_page-fix
replace BUG_ON()s with WARN_ON()s
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Cc: Christian Koenig <christian.koenig@xxxxxxx>
Cc: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxxxxxxx>
Cc: Huang Ying <ying.huang@xxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: "Kirill A. Shutemov" <kirill@xxxxxxxxxxxxx>
Cc: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Rik van Riel <riel@xxxxxxxxxxx>
Cc: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/ksm.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
--- a/mm/ksm.c~mm-reuse-only-pte-mapped-ksm-page-in-do_wp_page-fix
+++ a/mm/ksm.c
@@ -2647,9 +2647,14 @@ bool reuse_ksm_page(struct page *page,
struct vm_area_struct *vma,
unsigned long address)
{
- VM_BUG_ON_PAGE(is_zero_pfn(page_to_pfn(page)), page);
- VM_BUG_ON_PAGE(!page_mapped(page), page);
- VM_BUG_ON_PAGE(!PageLocked(page), page);
+#ifdef CONFIG_DEBUG_VM
+ if (WARN_ON(is_zero_pfn(page_to_pfn(page))) ||
+ WARN_ON(!page_mapped(page)) ||
+ WARN_ON(!PageLocked(page))) {
+ dump_page(page, "reuse_ksm_page");
+ return false;
+ }
+#endif
if (PageSwapCache(page) || !page_stable_node(page))
return false;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-reuse-only-pte-mapped-ksm-page-in-do_wp_page.patch
mm-swap-check-if-swap-backing-device-is-congested-or-not-fix.patch
mm-oom-remove-prefer-children-over-parent-heuristic-checkpatch-fixes.patch
mm-memcontrol-expose-thp-events-on-a-per-memcg-basis-fix.patch
