|
@@ -294,22 +294,11 @@ no_context:
|
|
|
* us unable to handle the page fault gracefully.
|
|
|
*/
|
|
|
out_of_memory:
|
|
|
- if (is_global_init(current)) {
|
|
|
- panic("INIT out of memory\n");
|
|
|
- yield();
|
|
|
- goto survive;
|
|
|
- }
|
|
|
- printk("fault:Out of memory\n");
|
|
|
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;
|
|
|
+ if (!user_mode(regs))
|
|
|
+ goto no_context;
|
|
|
+ pagefault_out_of_memory();
|
|
|
+ return;
|
|
|
|
|
|
do_sigbus:
|
|
|
printk("fault:Do sigbus\n");
|