Merge "mm: page_alloc: avoid fatal sig check for GFP_NOFS" (bd807a2a) · Commits · e / devices / android_kernel_fairphone_FP4

mm/page_alloc.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -4646,7 +4646,8 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
		if (current->flags & PF_MEMALLOC)
		goto nopage;

		if (fatal_signal_pending(current) && !(gfp_mask & __GFP_NOFAIL))
		if (fatal_signal_pending(current) && !(gfp_mask & __GFP_NOFAIL) &&
		(gfp_mask & __GFP_FS))
		goto nopage;

		/* Try direct reclaim and then allocating */