commit e3741b506c5088fa8c911bb5884c430f770fb49d upstream.

There should be no references to it any more and a parallel mark should
not be reordered against us.  Use non-locked varient to clear page active.

Signed-off-by: Mel Gorman <mgorman@suse.de>
Acked-by: Rik van Riel <redacted>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Vlastimil Babka <redacted>
Cc: Jan Kara <jack@suse.cz>
Cc: Michal Hocko <redacted>
Cc: Hugh Dickins <hughd@google.com>
Cc: Dave Hansen <redacted>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: "Paul E. McKenney" <redacted>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Mel Gorman <mgorman@suse.de>
---
 mm/swap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/swap.c b/mm/swap.c
index 026113d..afeabe3 100644
--- a/mm/swap.c
+++ b/mm/swap.c

@@ -835,7 +835,7 @@ void release_pages(struct page **pages, int nr, bool cold)
 		}
 
 		/* Clear Active bit in case of parallel mark_page_accessed */
-		ClearPageActive(page);
+		__ClearPageActive(page);
 
 		list_add(&page->lru, &pages_to_free);
 	}

-- 
1.8.4.5