diff options
| author | Paul Reioux <paul@paul-Precision-WorkStation-T5500.(none)> | 2012-01-26 14:57:57 -0800 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-06-12 21:20:22 +1000 |
| commit | d6cc98c629a36ddd0c44cac326082034e73a09c0 (patch) | |
| tree | bcb0d150669d23bbf67f25586c8a3a9b52d8d19f /mm | |
| parent | 1e291c9a70e255278ddb451097f0d65126556b61 (diff) | |
| download | kernel_samsung_smdk4412-d6cc98c629a36ddd0c44cac326082034e73a09c0.tar.gz kernel_samsung_smdk4412-d6cc98c629a36ddd0c44cac326082034e73a09c0.tar.bz2 kernel_samsung_smdk4412-d6cc98c629a36ddd0c44cac326082034e73a09c0.zip | |
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 c11955c380b..0d1eb7eea19 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -624,8 +624,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); @@ -1291,7 +1293,9 @@ 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) @@ -1713,7 +1717,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); } |