1 files changed, 4 insertions, 4 deletions

diff --git a/mm/swap.c b/mm/swap.c
index cb29ae5d33ab..308e57d8d7ed 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -118,7 +118,7 @@ static void pagevec_move_tail(struct pagevec *pvec)
                         spin_lock(&zone->lru_lock);
                 }
                 if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) {
-                        int lru = page_is_file_cache(page);
+                        int lru = page_lru_base_type(page);
                         list_move_tail(&page->lru, &zone->lru[lru].list);
                         pgmoved++;
                 }
@@ -181,7 +181,7 @@ void activate_page(struct page *page)
         spin_lock_irq(&zone->lru_lock);
         if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) {
                 int file = page_is_file_cache(page);
-                int lru = LRU_BASE + file;
+                int lru = page_lru_base_type(page);
                 del_page_from_lru_list(zone, page, lru);
 
                 SetPageActive(page);
@@ -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);