On Thu, Apr 22, 2010 at 18:06, <npiggin@xxxxxxx> wrote: > As explained in commit 1c0fe6e3bd, we want to call the architecture independent > oom killer when getting an unexplained OOM from handle_mm_fault, rather than > simply killing current. > > Cc: linux-m68k@xxxxxxxxxxxxxxxxxxxx > Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> > Cc: linux-arch@xxxxxxxxxxxxxxx > Signed-off-by: Nick Piggin <npiggin@xxxxxxx> > --- > Index: linux-2.6/arch/m68k/mm/fault.c > =================================================================== > --- linux-2.6.orig/arch/m68k/mm/fault.c > +++ linux-2.6/arch/m68k/mm/fault.c > @@ -180,15 +180,10 @@ good_area: > */ > out_of_memory: > up_read(&mm->mmap_sem); > - if (is_global_init(current)) { > - yield(); > - down_read(&mm->mmap_sem); > - goto survive; > - } > - > - printk("VM: killing process %s\n", current->comm); > - if (user_mode(regs)) > - do_group_exit(SIGKILL); > + if (!user_mode(regs)) > + goto no_context; > + pagefault_out_of_memory(); > + return; > > no_context: > current->thread.signo = SIGBUS; Will apply after unintroducing 2 compiler warnings:: diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c index 0adfcb6..2db6099 100644 --- a/arch/m68k/mm/fault.c +++ b/arch/m68k/mm/fault.c @@ -140,7 +140,6 @@ good_area: * the fault. */ - survive: fault = handle_mm_fault(mm, vma, address, write ? FAULT_FLAG_WRITE : 0); #ifdef DEBUG printk("handle_mm_fault returns %d\n",fault); @@ -169,7 +168,7 @@ out_of_memory: if (!user_mode(regs)) goto no_context; pagefault_out_of_memory(); - return; + return 0; no_context: current->thread.signo = SIGBUS; Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html