X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=mm%2Fmemory.c;h=5ec6f199e68581bf62f2ba30efc2c207a991cd17;hb=3812c8c8f3953921ef18544110dafc3505c1ac62;hp=a8f9deab87191cbe7fab88753a4a3ac10ca8c0b1;hpb=fb2a6fc56be66c169f8b80e07ed999ba453a2db2;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git diff --git a/mm/memory.c b/mm/memory.c index a8f9dea..5ec6f19 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3867,6 +3867,9 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, if (flags & FAULT_FLAG_USER) mem_cgroup_disable_oom(); + if (WARN_ON(task_in_memcg_oom(current) && !(ret & VM_FAULT_OOM))) + mem_cgroup_oom_synchronize(); + return ret; }