---

yaml --- r: 198245 b: refs/heads/master c: c175a0c h: refs/heads/master i: 198243: 222b03c v: v3
git-mirror · May 25, 2010 · e6cc5d7 · e6cc5d7
1 parent e45b196
commit e6cc5d7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1a5ab1210579e2d3ac8c0c227645823af5aafb0
+refs/heads/master: c175a0ce7584e5b498fff8cbdb9aa7912aa9fbba
diff --git a/trunk/include/linux/swap.h b/trunk/include/linux/swap.h
@@ -229,6 +229,11 @@ static inline void lru_cache_add_file(struct page *page)
 	__lru_cache_add(page, LRU_INACTIVE_FILE);
 }
 
+/* LRU Isolation modes. */
+#define ISOLATE_INACTIVE 0	/* Isolate inactive pages. */
+#define ISOLATE_ACTIVE 1	/* Isolate active pages. */
+#define ISOLATE_BOTH 2		/* Isolate both active and inactive pages. */
+
 /* linux/mm/vmscan.c */
 extern unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
 					gfp_t gfp_mask, nodemask_t *mask);

diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -839,11 +839,6 @@ static unsigned long shrink_page_list(struct list_head *page_list,
 	return nr_reclaimed;
 }
 
-/* LRU Isolation modes. */
-#define ISOLATE_INACTIVE 0	/* Isolate inactive pages. */
-#define ISOLATE_ACTIVE 1	/* Isolate active pages. */
-#define ISOLATE_BOTH 2		/* Isolate both active and inactive pages. */
-
 /*
  * Attempt to remove the specified page from its LRU.  Only take this page
  * if it is of the appropriate PageActive status.  Pages which are being