diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-05-20 20:37:23 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 20:37:23 +0200 |
| commit | f6304f5804f228b6c2fea9e3dfac25c5b2db9b38 (patch) | |
| tree | 362b9b6a3bd32b868e5917a32d448ac75c5854df /arch/ia64/mm/fault.c | |
| parent | Merge branch 'for_2.6.35' of git://git.pwsan.com/linux-2.6 into omap-for-linus (diff) | |
| parent | omap4: Add support for i2c init (diff) | |
| download | linux-f6304f5804f228b6c2fea9e3dfac25c5b2db9b38.tar.xz linux-f6304f5804f228b6c2fea9e3dfac25c5b2db9b38.zip | |
Merge branch 'omap4-i2c-init' into omap-for-linus
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 19261a99e623..0799fea4c588 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 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(); } |