diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 16:02:02 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 16:02:02 (GMT) |
| commit | 06b2e9886e039c2f1b3048c47e539b80ab4155b0 (patch) | |
| tree | cdc295333e93cf407fd205b21f31a12d75b0a635 /arch/parisc/mm | |
| parent | 35926ff5fba8245bd1c6ac04155048f6f89232b1 (diff) | |
| parent | 210501aa570fdaa8b06e56fd1c04f31f2d3f368b (diff) | |
| download | linux-fsl-qoriq-06b2e9886e039c2f1b3048c47e539b80ab4155b0.tar.xz | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: Call pagefault_disable/pagefault_enable in kmap_atomic/kunmap_atomic
parisc: Remove unnecessary macros from entry.S
parisc: LWS fixes for syscall.S
parisc: Delete unnecessary nop's in entry.S
parisc: Avoid interruption in critical region in entry.S
parisc: invoke oom-killer from page fault
parisc: clear floating point exception flag on SIGFPE signal
parisc: Use of align_frame provides stack frame.
Diffstat (limited to 'arch/parisc/mm')
| -rw-r--r-- | arch/parisc/mm/fault.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c index c6afbfc..18162ce 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c @@ -264,8 +264,7 @@ no_context: out_of_memory: up_read(&mm->mmap_sem); - 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(); } |