On Fri, 04 Dec 2015 02:07:20 +0000 Ben Hutchings <ben@xxxxxxxxxxxxxxx> wrote: > On Wed, 2015-12-02 at 15:07 -0800, akpm@xxxxxxxxxxxxxxxxxxxx wrote: > > The patch titled > > Subject: mm/oom_kill.c: avoid killing init > > has been added to the -mm tree. Its filename is > > oom-kill-init-lead-panic.patch > [...] > > --- a/mm/oom_kill.c~oom-kill-init-lead-panic > > +++ a/mm/oom_kill.c > > @@ -608,6 +608,8 @@ void oom_kill_process(struct oom_control > > continue; > > if (unlikely(p->flags & PF_KTHREAD)) > > continue; > > + if (!is_global_init(p)) > > + continue; > [...] > > It looks like this has been forward-ported from an earlier version, > where the conditions were written as: > > if (A && B && ....) > do_send_sig_info(...); > > Since they are now written as 'if (!A) continue', the '!' needs to be > dropped from this one. > argh, crap, yes, thanks. And I just injected this into linux-next. Mark, could you please add this? From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: oom-kill-init-lead-panic-fix fix inverted test, per Ben Cc: Chen Jie <chenjie6@xxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Li Zefan <lizefan@xxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxx> Cc: Mark Brown <broonie@xxxxxxxxxx> Cc: Ben Hutchings <ben@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/oom_kill.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/oom_kill.c~oom-kill-init-lead-panic-fix mm/oom_kill.c --- a/mm/oom_kill.c~oom-kill-init-lead-panic-fix +++ a/mm/oom_kill.c @@ -608,7 +608,7 @@ void oom_kill_process(struct oom_control continue; if (unlikely(p->flags & PF_KTHREAD)) continue; - if (!is_global_init(p)) + if (is_global_init(p)) continue; if (p->signal->oom_score_adj == OOM_SCORE_ADJ_MIN) continue; _ -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html