aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/swap.h5
-rw-r--r--mm/vmscan.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h
index c38bd157695b..c0d23ac710d5 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -371,6 +371,11 @@ static inline struct page *lookup_swap_cache(swp_entry_t swp)
371 return NULL; 371 return NULL;
372} 372}
373 373
374static inline int add_to_swap(struct page *page)
375{
376 return 0;
377}
378
374static inline int add_to_swap_cache(struct page *page, swp_entry_t entry, 379static inline int add_to_swap_cache(struct page *page, swp_entry_t entry,
375 gfp_t gfp_mask) 380 gfp_t gfp_mask)
376{ 381{
diff --git a/mm/vmscan.c b/mm/vmscan.c
index cc7401571cba..f350523a8eee 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -617,7 +617,6 @@ static unsigned long shrink_page_list(struct list_head *page_list,
617 referenced && page_mapping_inuse(page)) 617 referenced && page_mapping_inuse(page))
618 goto activate_locked; 618 goto activate_locked;
619 619
620#ifdef CONFIG_SWAP
621 /* 620 /*
622 * Anonymous process memory has backing store? 621 * Anonymous process memory has backing store?
623 * Try to allocate it some swap space here. 622 * Try to allocate it some swap space here.
@@ -629,7 +628,6 @@ static unsigned long shrink_page_list(struct list_head *page_list,
629 goto activate_locked; 628 goto activate_locked;
630 may_enter_fs = 1; 629 may_enter_fs = 1;
631 } 630 }
632#endif /* CONFIG_SWAP */
633 631
634 mapping = page_mapping(page); 632 mapping = page_mapping(page);
635 633