X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=mm%2Fswap.c;h=308e57d8d7ed9e256eb26be6b5478da06aac5d7f;hb=f29ad6a99b596b8169744d107bf088e8be9e8d0d;hp=168d53e6e58e6c9605fd678079da426258c8e799;hpb=401a8e1c1670085b8177330ca47d4f7c4ac88761;p=safe%2Fjmp%2Flinux-2.6

diff --git a/mm/swap.c b/mm/swap.c
index 168d53e..308e57d 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -189,7 +189,7 @@ void activate_page(struct page *page)
 		add_page_to_lru_list(zone, page, lru);
 		__count_vm_event(PGACTIVATE);
 
-		update_page_reclaim_stat(zone, page, !!file, 1);
+		update_page_reclaim_stat(zone, page, file, 1);
 	}
 	spin_unlock_irq(&zone->lru_lock);
 }
@@ -496,7 +496,7 @@ EXPORT_SYMBOL(pagevec_lookup_tag);
  */
 void __init swap_setup(void)
 {
-	unsigned long megs = num_physpages >> (20 - PAGE_SHIFT);
+	unsigned long megs = totalram_pages >> (20 - PAGE_SHIFT);
 
 #ifdef CONFIG_SWAP
 	bdi_init(swapper_space.backing_dev_info);