diff options
| author | Nick Piggin <npiggin@suse.de> | 2010-04-29 23:48:18 +0200 |
|---|---|---|
| committer | Matt Turner <mattst88@monolith.freenet-rz.de> | 2010-05-26 00:40:28 +0200 |
| commit | 1cb3d8e2c8d30d2cbfe42b696d501d0a016edec1 (patch) | |
| tree | 063a37d4a4f06321c2cad8a96979c1638c667771 /arch/alpha/mm/fault.c | |
| parent | Convert alpha to use clocksources instead of arch_gettimeoffset (diff) | |
| download | linux-1cb3d8e2c8d30d2cbfe42b696d501d0a016edec1.tar.xz linux-1cb3d8e2c8d30d2cbfe42b696d501d0a016edec1.zip | |
alpha: invoke oom-killer from page fault
As explained in commit 1c0fe6e3bd, we want to call the architecture
independent oom killer when getting an unexplained OOM from
handle_mm_fault, rather than simply killing current.
[mattst88: kill now unused 'survive' label]
Cc: linux-alpha@vger.kernel.org
Cc: Richard Henderson <rth@twiddle.net>
Cc: linux-arch@vger.kernel.org
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Nick Piggin <npiggin@suse.de>
Diffstat (limited to 'arch/alpha/mm/fault.c')
| -rw-r--r-- | arch/alpha/mm/fault.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c index 00a31deaa96e..fadd5f882ff9 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c @@ -142,7 +142,6 @@ do_page_fault(unsigned long address, unsigned long mmcsr, goto bad_area; } - survive: /* If for any reason at all we couldn't handle the fault, make sure we exit gracefully rather than endlessly redo the fault. */ @@ -188,16 +187,10 @@ do_page_fault(unsigned long address, unsigned long mmcsr, /* We ran out of memory, or some other thing happened to us that made us unable to handle the page fault gracefully. */ out_of_memory: - if (is_global_init(current)) { - yield(); - down_read(&mm->mmap_sem); - goto survive; - } - printk(KERN_ALERT "VM: killing process %s(%d)\n", - current->comm, task_pid_nr(current)); if (!user_mode(regs)) goto no_context; - do_group_exit(SIGKILL); + pagefault_out_of_memory(); + return; do_sigbus: /* Send a sigbus, regardless of whether we were in kernel |