X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mm%2Fswap_state.c;h=67daecb6031ad62022fbe7aa7fe9ea7b027dd3cf;hb=2fe83b3ad12d43799af5f3156886eca443a88bac;hp=5f7cf2a4cb55f8e9a106776b8d45ec5433c6991e;hpb=0d1782144e81faf6203075c5fcd0a2f0db91af5b;p=powerpc.git

diff --git a/mm/swap_state.c b/mm/swap_state.c
index 5f7cf2a4cb..67daecb603 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -21,7 +21,7 @@
 
 /*
  * swapper_space is a fiction, retained to simplify the path through
- * vmscan's shrink_list, to make sync_page look nicer, and to allow
+ * vmscan's shrink_page_list, to make sync_page look nicer, and to allow
  * future use of radix_tree tags in the swap cache.
  */
 static const struct address_space_operations swap_aops = {
@@ -334,7 +334,8 @@ struct page *read_swap_cache_async(swp_entry_t entry,
 		 * Get a new page to read into from swap.
 		 */
 		if (!new_page) {
-			new_page = alloc_page_vma(GFP_HIGHUSER, vma, addr);
+			new_page = alloc_page_vma(GFP_HIGHUSER_MOVABLE,
+								vma, addr);
 			if (!new_page)
 				break;		/* Out of memory */
 		}