git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/soundcore-preclaim' into for-linus
[pandora-kernel.git]
/
arch
/
sparc
/
mm
/
fault_32.c
diff --git
a/arch/sparc/mm/fault_32.c
b/arch/sparc/mm/fault_32.c
index
a5e30c6
..
b99f81c
100644
(file)
--- 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);
*/
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:
goto no_context;
do_sigbus: