From d6cc98c629a36ddd0c44cac326082034e73a09c0 Mon Sep 17 00:00:00 2001
From: Paul Reioux <paul@paul-Precision-WorkStation-T5500.(none)>
Date: Thu, 26 Jan 2012 14:57:57 -0800
Subject: mm/vmscan: Add #ifdef around "WasActive page flag"

also fix a merge error @ putback_lru_page
---
 mm/vmscan.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'mm')

diff --git a/mm/vmscan.c b/mm/vmscan.c
index c11955c..0d1eb7e 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);
 	}
 
-- 
cgit v1.1