Signed-off-by: Fernando Luis Vazquez Cao <[email protected]>
---
diff -urNp linux-2.6.26/mm/swapfile.c linux-2.6.26-fixes/mm/swapfile.c
--- linux-2.6.26/mm/swapfile.c 2008-07-14 06:51:29.000000000 +0900
+++ linux-2.6.26-fixes/mm/swapfile.c 2008-07-28 20:42:46.000000000 +0900
@@ -655,8 +655,8 @@ static int unuse_mm(struct mm_struct *mm
if (!down_read_trylock(&mm->mmap_sem)) {
/*
- * Activate page so shrink_cache is unlikely to unmap its
- * ptes while lock is dropped, so swapoff can make progress.
+ * Activate page so shrink_inactive_list is unlikely to unmap
+ * its ptes while lock is dropped, so swapoff can make progress.
*/
activate_page(page);
unlock_page(page);
diff -urNp linux-2.6.26/mm/vmscan.c linux-2.6.26-fixes/mm/vmscan.c
--- linux-2.6.26/mm/vmscan.c 2008-07-14 06:51:29.000000000 +0900
+++ linux-2.6.26-fixes/mm/vmscan.c 2008-07-28 20:39:38.000000000 +0900
@@ -1940,7 +1940,7 @@ module_init(kswapd_init)
int zone_reclaim_mode __read_mostly;
#define RECLAIM_OFF 0
-#define RECLAIM_ZONE (1<<0) /* Run shrink_cache on the zone */
+#define RECLAIM_ZONE (1<<0) /* Run shrink_inactive_list on the zone */
#define RECLAIM_WRITE (1<<1) /* Writeout pages during reclaim */
#define RECLAIM_SWAP (1<<2) /* Swap pages out during reclaim */