diff options
Diffstat (limited to 'arch/ia64/mm/fault.c')
-rw-r--r-- | arch/ia64/mm/fault.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c index 19261a99e62..0799fea4c58 100644 --- a/arch/ia64/mm/fault.c +++ b/arch/ia64/mm/fault.c | |||
@@ -148,7 +148,6 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re | |||
148 | if ((vma->vm_flags & mask) != mask) | 148 | if ((vma->vm_flags & mask) != mask) |
149 | goto bad_area; | 149 | goto bad_area; |
150 | 150 | ||
151 | survive: | ||
152 | /* | 151 | /* |
153 | * If for any reason at all we couldn't handle the fault, make | 152 | * If for any reason at all we couldn't handle the fault, make |
154 | * sure we exit gracefully rather than endlessly redo the | 153 | * 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 | |||
276 | 275 | ||
277 | out_of_memory: | 276 | out_of_memory: |
278 | up_read(&mm->mmap_sem); | 277 | up_read(&mm->mmap_sem); |
279 | if (is_global_init(current)) { | 278 | if (!user_mode(regs)) |
280 | yield(); | 279 | goto no_context; |
281 | down_read(&mm->mmap_sem); | 280 | pagefault_out_of_memory(); |
282 | goto survive; | ||
283 | } | ||
284 | printk(KERN_CRIT "VM: killing process %s\n", current->comm); | ||
285 | if (user_mode(regs)) | ||
286 | do_group_exit(SIGKILL); | ||
287 | goto no_context; | ||
288 | } | 281 | } |