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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
arch
/
parisc
/
mm
/
fault.c
diff --git
a/arch/parisc/mm/fault.c
b/arch/parisc/mm/fault.c
index
c6afbfc
..
18162ce
100644
(file)
--- 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();
}