|
@@ -308,7 +308,6 @@ good_area:
|
|
|
* make sure we exit gracefully rather than endlessly redo
|
|
|
* the fault.
|
|
|
*/
|
|
|
- survive:
|
|
|
ret = handle_mm_fault(mm, vma, address, is_write ? FAULT_FLAG_WRITE : 0);
|
|
|
if (unlikely(ret & VM_FAULT_ERROR)) {
|
|
|
if (ret & VM_FAULT_OOM)
|
|
@@ -360,15 +359,10 @@ bad_area_nosemaphore:
|
|
|
*/
|
|
|
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", current->comm);
|
|
|
- if (user_mode(regs))
|
|
|
- do_group_exit(SIGKILL);
|
|
|
- return SIGKILL;
|
|
|
+ if (!user_mode(regs))
|
|
|
+ return SIGKILL;
|
|
|
+ pagefault_out_of_memory();
|
|
|
+ return 0;
|
|
|
|
|
|
do_sigbus:
|
|
|
up_read(&mm->mmap_sem);
|