diff for duplicates of <20200626032959.TpUI4oby1%akpm@linux-foundation.org> diff --git a/a/1.txt b/N1/1.txt index e9fbf3a..21371b8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -69,3 +69,18 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> #include <linux/vmalloc.h> #include <linux/swap_slots.h> #include <linux/huge_mm.h> +- ++#include "internal.h" + + /* + * swapper_space is a fiction, retained to simplify the path through +@@ -429,7 +429,7 @@ struct page *__read_swap_cache_async(swp + __SetPageSwapBacked(page); + + /* May fail (-ENOMEM) if XArray node allocation failed. */ +- if (add_to_swap_cache(page, entry, gfp_mask & GFP_KERNEL)) { ++ if (add_to_swap_cache(page, entry, gfp_mask & GFP_RECLAIM_MASK)) { + put_swap_page(page, entry); + goto fail_unlock; + } +_ diff --git a/a/content_digest b/N1/content_digest index 26e073b..54aa956 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -82,6 +82,21 @@ "@@ -21,7 +21,7 @@\n" " #include <linux/vmalloc.h>\n" " #include <linux/swap_slots.h>\n" - #include <linux/huge_mm.h> + " #include <linux/huge_mm.h>\n" + "-\n" + "+#include \"internal.h\"\n" + " \n" + " /*\n" + " * swapper_space is a fiction, retained to simplify the path through\n" + "@@ -429,7 +429,7 @@ struct page *__read_swap_cache_async(swp\n" + " \t__SetPageSwapBacked(page);\n" + " \n" + " \t/* May fail (-ENOMEM) if XArray node allocation failed. */\n" + "-\tif (add_to_swap_cache(page, entry, gfp_mask & GFP_KERNEL)) {\n" + "+\tif (add_to_swap_cache(page, entry, gfp_mask & GFP_RECLAIM_MASK)) {\n" + " \t\tput_swap_page(page, entry);\n" + " \t\tgoto fail_unlock;\n" + " \t}\n" + _ -88fc18aff7417d62129c2f7dae0a9f5287e37c4f3c2c41296f6e0ab3152b8674 +95a103acf85e2fb1f2e4a503a1b1f17731f480c2a0a4dc1b051a224ca3b78b88
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.