|
@@ -142,7 +142,6 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
|
|
goto bad_area;
|
|
goto bad_area;
|
|
}
|
|
}
|
|
|
|
|
|
- survive:
|
|
|
|
/* If for any reason at all we couldn't handle the fault,
|
|
/* If for any reason at all we couldn't handle the fault,
|
|
make sure we exit gracefully rather than endlessly redo
|
|
make sure we exit gracefully rather than endlessly redo
|
|
the fault. */
|
|
the fault. */
|
|
@@ -188,16 +187,10 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
|
|
/* We ran out of memory, or some other thing happened to us that
|
|
/* We ran out of memory, or some other thing happened to us that
|
|
made us unable to handle the page fault gracefully. */
|
|
made us unable to handle the page fault gracefully. */
|
|
out_of_memory:
|
|
out_of_memory:
|
|
- if (is_global_init(current)) {
|
|
|
|
- yield();
|
|
|
|
- down_read(&mm->mmap_sem);
|
|
|
|
- goto survive;
|
|
|
|
- }
|
|
|
|
- printk(KERN_ALERT "VM: killing process %s(%d)\n",
|
|
|
|
- current->comm, task_pid_nr(current));
|
|
|
|
if (!user_mode(regs))
|
|
if (!user_mode(regs))
|
|
goto no_context;
|
|
goto no_context;
|
|
- do_group_exit(SIGKILL);
|
|
|
|
|
|
+ pagefault_out_of_memory();
|
|
|
|
+ return;
|
|
|
|
|
|
do_sigbus:
|
|
do_sigbus:
|
|
/* Send a sigbus, regardless of whether we were in kernel
|
|
/* Send a sigbus, regardless of whether we were in kernel
|