projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
550f0d9
)
parisc: invoke oom-killer from page fault
author
Nick Piggin
<
[email protected]
>
Thu, 22 Apr 2010 16:06:23 +0000
(16:06 +0000)
committer
Kyle McMartin
<
[email protected]
>
Sun, 30 May 2010 09:41:30 +0000
(
05:41
-0400)
As explained in commit
1c0fe6e3bd
, we want to call the architecture independent
oom killer when getting an unexplained OOM from handle_mm_fault, rather than
simply killing current.
Cc:
[email protected]
Cc:
[email protected]
Signed-off-by: Nick Piggin <
[email protected]
>
Acked-by: David Rientjes <
[email protected]
>
Signed-off-by: Kyle McMartin <
[email protected]
>
arch/parisc/mm/fault.c
patch
|
blob
|
history
diff --git
a/arch/parisc/mm/fault.c
b/arch/parisc/mm/fault.c
index c6afbfc957703f800610a96f0caa8008f53e598e..18162ce4261ef63eae30818c2eb5ffa4608ba728 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();
}