The patch titled
Subject: mm: rmap: use VM_BUG_ON() in __page_check_anon_rmap()
has been removed from the -mm tree. Its filename was
mm-rmap-use-vm_bug_on-in-__page_check_anon_rmap.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx>
Subject: mm: rmap: use VM_BUG_ON() in __page_check_anon_rmap()
The __page_check_anon_rmap() just calls two BUG_ON()s protected by
CONFIG_DEBUG_VM, the #ifdef could be eliminated by using VM_BUG_ON().
Link: http://lkml.kernel.org/r/1572973416-18532-1-git-send-email-yang.shi@xxxxxxxxxxxxxxxxx
Signed-off-by: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx>
Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/rmap.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/mm/rmap.c~mm-rmap-use-vm_bug_on-in-__page_check_anon_rmap
+++ a/mm/rmap.c
@@ -1075,7 +1075,6 @@ static void __page_set_anon_rmap(struct
static void __page_check_anon_rmap(struct page *page,
struct vm_area_struct *vma, unsigned long address)
{
-#ifdef CONFIG_DEBUG_VM
/*
* The page's anon-rmap details (mapping and index) are guaranteed to
* be set up correctly at this point.
@@ -1088,9 +1087,8 @@ static void __page_check_anon_rmap(struc
* are initially only visible via the pagetables, and the pte is locked
* over the call to page_add_new_anon_rmap.
*/
- BUG_ON(page_anon_vma(page)->root != vma->anon_vma->root);
- BUG_ON(page_to_pgoff(page) != linear_page_index(vma, address));
-#endif
+ VM_BUG_ON(page_anon_vma(page)->root != vma->anon_vma->root);
+ VM_BUG_ON(page_to_pgoff(page) != linear_page_index(vma, address));
}
/**
_
Patches currently in -mm which might be from yang.shi@xxxxxxxxxxxxxxxxx are
mm-mempolicy-fix-the-wrong-return-value-and-potential-pages-leak-of-mbind.patch
mm-vmscan-remove-unused-scan_control-parameter-from-pageout.patch
mm-shmem-use-proper-gfp-flags-for-shmem_writepage.patch
