mm-vm_bug_on-lru-page-flags.patch removed from -mm tree
The patch titled
Subject: mm: VM_BUG_ON lru page flags
has been removed from the -mm tree. Its filename was
mm-vm_bug_on-lru-page-flags.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Yu Zhao <[email protected]>
Subject: mm: VM_BUG_ON lru page flags
Move scattered VM_BUG_ONs to two essential places that cover all lru list additions and deletions.
Signed-off-by Yu Zhao <[email protected]>
Cc Alex Shi <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Matthew Wilcox <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Roman Gushchin <[email protected]>
Cc Vladimir Davydov <[email protected]>
Cc Vlastimil Babka <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/mm_inline.h | 4 ++++ mm/swap.c | 2 -- mm/vmscan.c | 1 - 3 files changed, 4 insertions(+), 3 deletions(-)
include/linux/mm_inline.h renamed from include/linux/mm_inline.h~mm-vm_bug_on-lru-page-flags +4 -0
@@ -66,6 +66,8 @@ static inline enum lru_list page_lru_bas*/ static __always_inline void __clear_page_lru_flags(struct page *page) { +VM_BUG_ON_PAGE (!PageLRU (page), page); +__ClearPageLRU (page);/* this shouldn't happen, so leave the flags to bad_page() */
@@ -87,6 +89,8 @@ static __always_inline enum lru_list pag {enum lru_list lru; +VM_BUG_ON_PAGE (PageActive (page) &&PageUnevictable (page), page); +if (PageUnevictable (page)) lru =LRU_UNEVICTABLE ;else {
mm/swap.c renamed from mm/swap.c~mm-vm_bug_on-lru-page-flags +0 -2
@@ -83,7 +83,6 @@ static void __page_cache_release(structunsigned long flags; lruvec =lock_page_lruvec_irqsave (page, &flags); -VM_BUG_ON_PAGE (!PageLRU (page), page);del_page_from_lru_list (page, lruvec);__clear_page_lru_flags (page);unlock_page_lruvec_irqrestore (lruvec, flags);
@@ -909,7 +908,6 @@ void release_pages(struct page **pages,if (prev_lruvec != lruvec) lock_batch =0 ; -VM_BUG_ON_PAGE (!PageLRU (page), page);del_page_from_lru_list (page, lruvec);__clear_page_lru_flags (page); }
mm/vmscan.c renamed from mm/vmscan.c~mm-vm_bug_on-lru-page-flags +0 -1
@@ -4281,7 +4281,6 @@ void check_move_unevictable_pages(struct lruvec =relock_page_lruvec_irq (page, lruvec);if (page_evictable (page) &&PageUnevictable (page)) { -VM_BUG_ON_PAGE (PageActive (page), page);del_page_from_lru_list (page, lruvec);ClearPageUnevictable (page);add_page_to_lru_list (page, lruvec);
_
Patches currently in -mm which might be from [email protected] are