On Fri, 2022-03-11 at 23:09 +0100, Sebastian Andrzej Siewior wrote: > On 2022-03-11 15:46:23 [-0600], Tom Zanussi wrote: > > index 79e34e98f812..e1dfb01f4623 100644 > > --- a/include/linux/sched.h > > +++ b/include/linux/sched.h > > @@ -802,6 +802,18 @@ struct task_struct { > > /* to be used once the psi infrastructure lands upstream. */ > > unsigned use_memdelay:1; > > #endif > > +#ifdef CONFIG_PSI > > + /* Stalled due to lack of memory */ > > + unsigned in_memstall:1; > > +#endif > > +#ifdef CONFIG_PAGE_OWNER > > + /* Used by page_owner=on to detect recursion in page tracking. > > */ > > + unsigned in_page_owner:1; > > +#endif > > the upper two don't look like they belong here. You're right, they don't - I missed those when fixing the conflict in this file. Will do a new release shortly to fix that. Thanks for reviewing and pointing it out. Tom > > > +#ifdef CONFIG_EVENTFD > > + /* Recursion prevention for eventfd_signal() */ > > + unsigned in_eventfd_signal:1; > > +#endif > > > > unsigned long atomic_flags; /* Flags > > requiring atomic access. */ > > > > diff --git a/localversion-rt b/localversion-rt > > Sebastian