|
@@ -148,7 +148,6 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
|
|
|
if ((vma->vm_flags & mask) != mask)
|
|
|
goto bad_area;
|
|
|
|
|
|
- survive:
|
|
|
/*
|
|
|
* If for any reason at all we couldn't handle the fault, make
|
|
|
* sure we exit gracefully rather than endlessly redo the
|
|
@@ -276,13 +275,7 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
|
|
|
|
|
|
out_of_memory:
|
|
|
up_read(&mm->mmap_sem);
|
|
|
- if (is_global_init(current)) {
|
|
|
- yield();
|
|
|
- down_read(&mm->mmap_sem);
|
|
|
- goto survive;
|
|
|
- }
|
|
|
- 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();
|
|
|
}
|