diff options
| author | Paul Reioux <paul@paul-Precision-WorkStation-T5500.(none)> | 2012-01-26 14:57:57 -0800 |
|---|---|---|
| committer | Andreas Blaesius <skate4life@gmx.de> | 2016-06-05 21:21:56 +0200 |
| commit | 4b99de5e1d9104087524c6a6e9d14559428a2421 (patch) | |
| tree | a5165fde6c73f0ff1396b12ac43f81df482d547a /mm | |
| parent | 0b237f39e49571f6ae1ed65154858800eb1831b4 (diff) | |
| download | kernel_samsung_espresso10-4b99de5e1d9104087524c6a6e9d14559428a2421.zip kernel_samsung_espresso10-4b99de5e1d9104087524c6a6e9d14559428a2421.tar.gz kernel_samsung_espresso10-4b99de5e1d9104087524c6a6e9d14559428a2421.tar.bz2 | |
mm/vmscan: Add #ifdef around "WasActive page flag"
also fix a merge error @ putback_lru_page
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/vmscan.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 692bec9..4a0d77f 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -627,8 +627,10 @@ void putback_lru_page(struct page *page) int was_unevictable = PageUnevictable(page); VM_BUG_ON(PageLRU(page)); +#ifdef CONFIG_CLEANCACHE if (active) SetPageWasActive(page); +#endif redo: ClearPageUnevictable(page); @@ -1286,7 +1288,9 @@ static unsigned long clear_active_flags(struct list_head *page_list, if (PageActive(page)) { lru += LRU_ACTIVE; ClearPageActive(page); +#ifdef CONFIG_CLEANCACHE SetPageWasActive(page); +#endif nr_active += numpages; } if (count) @@ -1708,7 +1712,9 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone, } ClearPageActive(page); /* we are de-activating */ +#ifdef CONFIG_CLEANCACHE SetPageWasActive(page); +#endif list_add(&page->lru, &l_inactive); } |