|
@@ -132,7 +132,6 @@ good_area:
|
|
|
* sure we exit gracefully rather than endlessly redo the
|
|
|
* fault.
|
|
|
*/
|
|
|
-survive:
|
|
|
fault = handle_mm_fault(mm, vma, address, writeaccess ? FAULT_FLAG_WRITE : 0);
|
|
|
if (unlikely(fault & VM_FAULT_ERROR)) {
|
|
|
if (fault & VM_FAULT_OOM)
|
|
@@ -211,15 +210,10 @@ no_context:
|
|
|
*/
|
|
|
out_of_memory:
|
|
|
up_read(&mm->mmap_sem);
|
|
|
- if (is_global_init(current)) {
|
|
|
- yield();
|
|
|
- down_read(&mm->mmap_sem);
|
|
|
- goto survive;
|
|
|
- }
|
|
|
- printk("VM: Killing process %s\n", tsk->comm);
|
|
|
- if (user_mode(regs))
|
|
|
- do_group_exit(SIGKILL);
|
|
|
- goto no_context;
|
|
|
+ pagefault_out_of_memory();
|
|
|
+ if (!user_mode(regs))
|
|
|
+ goto no_context;
|
|
|
+ return;
|
|
|
|
|
|
do_sigbus:
|
|
|
up_read(&mm->mmap_sem);
|