diff options
| author | Nick Piggin <npiggin@suse.de> | 2010-06-04 23:14:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-05 00:21:44 +0200 |
| commit | f9c497c4aea28be826b8450a5339952f2ffc705e (patch) | |
| tree | 810d6b4d03a8ad0ed5458606b9ac26f3c3d75ef2 /arch/frv/mm | |
| parent | ramoops: add HAS_IOMEM dependency (diff) | |
| download | linux-f9c497c4aea28be826b8450a5339952f2ffc705e.tar.xz linux-f9c497c4aea28be826b8450a5339952f2ffc705e.zip | |
frv: invoke oom-killer from page fault
As explained in commit 1c0fe6e3bd ("mm: invoke oom-killer from page
fault") , we want to call the architecture independent oom killer when
getting an unexplained OOM from handle_mm_fault, rather than simply
killing current.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: David Howells <dhowells@redhat.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/frv/mm')
| -rw-r--r-- | arch/frv/mm/fault.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/frv/mm/fault.c b/arch/frv/mm/fault.c index 30f5d100a81c..a325d57a83d5 100644 --- a/arch/frv/mm/fault.c +++ b/arch/frv/mm/fault.c @@ -257,10 +257,10 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear */ out_of_memory: up_read(&mm->mmap_sem); - printk("VM: killing process %s\n", current->comm); - if (user_mode(__frame)) - do_group_exit(SIGKILL); - goto no_context; + if (!user_mode(__frame)) + goto no_context; + pagefault_out_of_memory(); + return; do_sigbus: up_read(&mm->mmap_sem); |