mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-07 04:12:04 -04:00
Merge "mm: page_alloc: avoid fatal sig check for GFP_NOFS"
This commit is contained in:
commit
f0921de704
1 changed files with 2 additions and 1 deletions
|
|
@ -4692,7 +4692,8 @@ retry:
|
|||
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 */
|
||||
|
|
|
|||
Loading…
Reference in a new issue