diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-25 21:24:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-25 21:24:26 -0700 |
| commit | 4dc627d55edad85e26ae81f17634bd4590993ba0 (patch) | |
| tree | 678da065a5d77f41ab33819ea970baf994ca50e8 /arch/sparc/mm/fault_32.c | |
| parent | 9c9376886622b45c32f64c4444f5628dde77dfe6 (diff) | |
| parent | d8ed1d43e17898761c7221014a15a4c7501d2ff3 (diff) | |
| download | talos-op-linux-4dc627d55edad85e26ae81f17634bd4590993ba0.tar.gz talos-op-linux-4dc627d55edad85e26ae81f17634bd4590993ba0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Validate linear D-TLB misses.
sparc64: Update defconfig.
sparc32: Update defconfig.
sparc32: Kill trap table freeing code.
sparc: sys32.S incorrect compat-layer splice() system call
sparc: Use page_fault_out_of_memory() for VM_FAULT_OOM.
sparc64: Sign extend length arg to truncate syscalls when compat.
sparc: Fix cleanup crash in bbc_envctrl_cleanup()
Diffstat (limited to 'arch/sparc/mm/fault_32.c')
| -rw-r--r-- | arch/sparc/mm/fault_32.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c index a5e30c642ee3..b99f81c4906f 100644 --- a/arch/sparc/mm/fault_32.c +++ b/arch/sparc/mm/fault_32.c @@ -319,9 +319,10 @@ no_context: */ out_of_memory: up_read(&mm->mmap_sem); - printk("VM: killing process %s\n", tsk->comm); - if (from_user) - do_group_exit(SIGKILL); + if (from_user) { + pagefault_out_of_memory(); + return; + } goto no_context; do_sigbus: |
