diff options
| author | Johannes Weiner <hannes@cmpxchg.org> | 2013-08-08 12:56:30 +1000 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:43:59 -0700 |
| commit | 824b921aaa9d01c3d5118e9039ff6f4d40b61de8 (patch) | |
| tree | 3caa683c43eb6ba75af1da51b768b19dd265ca55 /arch/avr32 | |
| parent | 622b9d2399842f031d17f22656a8268d4ae667b9 (diff) | |
UPSTREAM arch: mm: do not invoke OOM killer on kernel fault OOM
Kernel faults are expected to handle OOM conditions gracefully (gup,
uaccess etc.), so they should never invoke the OOM killer. Reserve this
for faults triggered in user context when it is the only option.
Most architectures already do this, fix up the remaining few.
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: azurIt <azurit@pobox.sk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Change-Id: Id58a8ebe3ee619ef9ae3590b5788823fa6bd2dce
Reviewed-on: http://git-master/r/266404
GVS: Gerrit_Virtual_Submit
Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Tested-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Diffstat (limited to 'arch/avr32')
| -rw-r--r-- | arch/avr32/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c index b2f2d2d66849..2ca27b055825 100644 --- a/arch/avr32/mm/fault.c +++ b/arch/avr32/mm/fault.c @@ -228,9 +228,9 @@ no_context: */ out_of_memory: up_read(&mm->mmap_sem); - pagefault_out_of_memory(); if (!user_mode(regs)) goto no_context; + pagefault_out_of_memory(); return; do_sigbus: |