diff options
author | Hugh Dickins <hugh@veritas.com> | 2009-01-06 17:39:24 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 18:59:02 -0500 |
commit | 6d91add09f4bad5f4d4233b13faa392f0c4b16be (patch) | |
tree | 26f77047b316dfc0879307fbfda84b15a199155f /mm | |
parent | 3c1d43787b48c798f44dc32a6e6deb5ca2da3e68 (diff) |
mm: add Set,ClearPageSwapCache stubs
If we add NOOP stubs for SetPageSwapCache() and ClearPageSwapCache(), then
we can remove the #ifdef CONFIG_SWAPs from mm/migrate.c.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Acked-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/migrate.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 60510306c44a..55373983c9c6 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
@@ -300,12 +300,10 @@ static int migrate_page_move_mapping(struct address_space *mapping, | |||
300 | * Now we know that no one else is looking at the page. | 300 | * Now we know that no one else is looking at the page. |
301 | */ | 301 | */ |
302 | get_page(newpage); /* add cache reference */ | 302 | get_page(newpage); /* add cache reference */ |
303 | #ifdef CONFIG_SWAP | ||
304 | if (PageSwapCache(page)) { | 303 | if (PageSwapCache(page)) { |
305 | SetPageSwapCache(newpage); | 304 | SetPageSwapCache(newpage); |
306 | set_page_private(newpage, page_private(page)); | 305 | set_page_private(newpage, page_private(page)); |
307 | } | 306 | } |
308 | #endif | ||
309 | 307 | ||
310 | radix_tree_replace_slot(pslot, newpage); | 308 | radix_tree_replace_slot(pslot, newpage); |
311 | 309 | ||
@@ -373,9 +371,7 @@ static void migrate_page_copy(struct page *newpage, struct page *page) | |||
373 | 371 | ||
374 | mlock_migrate_page(newpage, page); | 372 | mlock_migrate_page(newpage, page); |
375 | 373 | ||
376 | #ifdef CONFIG_SWAP | ||
377 | ClearPageSwapCache(page); | 374 | ClearPageSwapCache(page); |
378 | #endif | ||
379 | ClearPagePrivate(page); | 375 | ClearPagePrivate(page); |
380 | set_page_private(page, 0); | 376 | set_page_private(page, 0); |
381 | /* page->mapping contains a flag for PageAnon() */ | 377 | /* page->mapping contains a flag for PageAnon() */ |