X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=mm%2Fswap_state.c;h=e6f15f8ca2af339ce9e90159bae0e6a800f06819;hb=5686b06cea34e31ec0a549d9b5ac00776e8e8d6d;hp=f24ab0dff554262e1da6866b866a4584871f8d9c;hpb=c72bb316916b1a6cf35e1d5238566ef27b0b7f80;p=~andy%2Flinux

diff --git a/mm/swap_state.c b/mm/swap_state.c
index f24ab0dff55..e6f15f8ca2a 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -122,7 +122,7 @@ int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp_mask)
 {
 	int error;
 
-	error = radix_tree_preload(gfp_mask);
+	error = radix_tree_maybe_preload(gfp_mask);
 	if (!error) {
 		error = __add_to_swap_cache(page, entry);
 		radix_tree_preload_end();
@@ -328,7 +328,7 @@ struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
 		/*
 		 * call radix_tree_preload() while we can wait.
 		 */
-		err = radix_tree_preload(gfp_mask & GFP_KERNEL);
+		err = radix_tree_maybe_preload(gfp_mask & GFP_KERNEL);
 		if (err)
 			break;