diff options
author | Hugh Dickins <hugh@veritas.com> | 2009-01-06 17:39:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 18:59:04 -0500 |
commit | 60371d971a3d01afd102f0bbf2681f32ecc31d78 (patch) | |
tree | 999cd75fbf80877f99b518e632c445ae849eeb4d /mm/vmscan.c | |
parent | ac47b003d03c2a4f28aef1d505b66d24ad191c4f (diff) |
mm: add add_to_swap stub
If we add a failing stub for add_to_swap(), then we can remove the #ifdef
CONFIG_SWAP from mm/vmscan.c.
This was intended as a source cleanup, but looking more closely, it turns
out that the !CONFIG_SWAP case was going to keep_locked for an anonymous
page, whereas now it goes to the more suitable activate_locked, like the
CONFIG_SWAP nr_swap_pages 0 case.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
Acked-by: Rik van Riel <riel@redhat.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Robin Holt <holt@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r-- | mm/vmscan.c | 2 |
1 files changed, 0 insertions, 2 deletions
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 | ||