On Thu, Dec 03, 2015 at 06:16:41PM -0800, Andrew Morton wrote: > Mark, could you please add this? I'm not going to do a build today, sorry - Stephen will be back on Monday so he should be able to integrate it if you send it to him. > 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; > _ > >
Attachment:
signature.asc
Description: PGP signature