|
@@ -770,8 +770,6 @@ EXPORT_SYMBOL(__pagevec_release);
|
|
|
void lru_add_page_tail(struct page *page, struct page *page_tail,
|
|
|
struct lruvec *lruvec, struct list_head *list)
|
|
|
{
|
|
|
- int uninitialized_var(active);
|
|
|
- enum lru_list lru;
|
|
|
const int file = 0;
|
|
|
|
|
|
VM_BUG_ON(!PageHead(page));
|
|
@@ -783,20 +781,6 @@ void lru_add_page_tail(struct page *page, struct page *page_tail,
|
|
|
if (!list)
|
|
|
SetPageLRU(page_tail);
|
|
|
|
|
|
- if (page_evictable(page_tail)) {
|
|
|
- if (PageActive(page)) {
|
|
|
- SetPageActive(page_tail);
|
|
|
- active = 1;
|
|
|
- lru = LRU_ACTIVE_ANON;
|
|
|
- } else {
|
|
|
- active = 0;
|
|
|
- lru = LRU_INACTIVE_ANON;
|
|
|
- }
|
|
|
- } else {
|
|
|
- SetPageUnevictable(page_tail);
|
|
|
- lru = LRU_UNEVICTABLE;
|
|
|
- }
|
|
|
-
|
|
|
if (likely(PageLRU(page)))
|
|
|
list_add_tail(&page_tail->lru, &page->lru);
|
|
|
else if (list) {
|
|
@@ -812,13 +796,13 @@ void lru_add_page_tail(struct page *page, struct page *page_tail,
|
|
|
* Use the standard add function to put page_tail on the list,
|
|
|
* but then correct its position so they all end up in order.
|
|
|
*/
|
|
|
- add_page_to_lru_list(page_tail, lruvec, lru);
|
|
|
+ add_page_to_lru_list(page_tail, lruvec, page_lru(page_tail));
|
|
|
list_head = page_tail->lru.prev;
|
|
|
list_move_tail(&page_tail->lru, list_head);
|
|
|
}
|
|
|
|
|
|
if (!PageUnevictable(page))
|
|
|
- update_page_reclaim_stat(lruvec, file, active);
|
|
|
+ update_page_reclaim_stat(lruvec, file, PageActive(page_tail));
|
|
|
}
|
|
|
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
|
|
|
|