diff options
| author | npiggin@suse.de <npiggin@suse.de> | 2010-05-07 14:34:33 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2010-05-18 14:45:54 -0700 |
| commit | 0c3b96e44739cdba7a75030107a2b47a15ee5f60 (patch) | |
| tree | a67169bfcd43d4cb6eb2e8839e8eec0b3a9c0768 /arch/ia64 | |
| parent | 7683a3f9748f7adfbe47e33002a4f710ab557293 (diff) | |
| download | linux-0c3b96e44739cdba7a75030107a2b47a15ee5f60.tar.gz linux-0c3b96e44739cdba7a75030107a2b47a15ee5f60.tar.bz2 linux-0c3b96e44739cdba7a75030107a2b47a15ee5f60.zip | |
[IA64] 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.
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/mm/fault.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c index 19261a99e623..0799fea4c588 100644 --- a/arch/ia64/mm/fault.c +++ b/arch/ia64/mm/fault.c @@ -148,7 +148,6 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re if ((vma->vm_flags & mask) != mask) 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 @@ -276,13 +275,7 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re out_of_memory: up_read(&mm->mmap_sem); - if (is_global_init(current)) { - yield(); - down_read(&mm->mmap_sem); - goto survive; - } - printk(KERN_CRIT "VM: killing process %s\n", current->comm); - if (user_mode(regs)) - do_group_exit(SIGKILL); - goto no_context; + if (!user_mode(regs)) + goto no_context; + pagefault_out_of_memory(); } |