X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=mm%2Fswap_state.c;h=e6f15f8ca2af339ce9e90159bae0e6a800f06819;hb=c26f3c908091294e5909f5459b6682e10922c824;hp=f24ab0dff554262e1da6866b866a4584871f8d9c;hpb=19bf1c2c7b9f21b9fe86315c5758d26c3049c2ad;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git diff --git a/mm/swap_state.c b/mm/swap_state.c index f24ab0d..e6f15f8 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;