diff options
| author | Hugh Dickins <hughd@google.com> | 2012-01-12 17:20:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 20:13:10 -0800 |
| commit | 1c1c53d43b387d02174911ecb42ce846577b0ea0 (patch) | |
| tree | bb1294b23d23f2403ab95068af6080b375cc3166 /mm | |
| parent | 4111304dab198c687bc60f2e235a9f7ee92c47c8 (diff) | |
| download | linux-3.10-1c1c53d43b387d02174911ecb42ce846577b0ea0.tar.gz linux-3.10-1c1c53d43b387d02174911ecb42ce846577b0ea0.tar.bz2 linux-3.10-1c1c53d43b387d02174911ecb42ce846577b0ea0.zip | |
mm: remove del_page_from_lru, add page_off_lru
del_page_from_lru() repeats del_page_from_lru_list(), also working out
which LRU the page was on, clearing the relevant bits. Decouple those
functions: remove del_page_from_lru() and add page_off_lru().
Signed-off-by: Hugh Dickins <hughd@google.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/swap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/swap.c b/mm/swap.c index 0d1b24b3fa8..b0f529b3897 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -53,7 +53,7 @@ static void __page_cache_release(struct page *page) spin_lock_irqsave(&zone->lru_lock, flags); VM_BUG_ON(!PageLRU(page)); __ClearPageLRU(page); - del_page_from_lru(zone, page); + del_page_from_lru_list(zone, page, page_off_lru(page)); spin_unlock_irqrestore(&zone->lru_lock, flags); } } @@ -617,7 +617,7 @@ void release_pages(struct page **pages, int nr, int cold) } VM_BUG_ON(!PageLRU(page)); __ClearPageLRU(page); - del_page_from_lru(zone, page); + del_page_from_lru_list(zone, page, page_off_lru(page)); } list_add(&page->lru, &pages_to_free); |