* Nicholas Piggin <npig...@gmail.com> wrote:

> Peter Zijlstra's on May 4, 2019 2:04 am:
> > On Fri, May 03, 2019 at 08:34:57PM +0800, kbuild test robot wrote:
> >> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git 
> >> sched/core
> >> head:   65874bd36e6ae3028539e989bfb5c28ad457368e
> >> commit: c2cb30bfceceba8a2a0d5713230a250dd6140e22 [24/27] power/suspend: 
> >> Add function to disable secondaries for suspend
> >> config: x86_64-randconfig-l3-05031806 (attached as .config)
> >> compiler: gcc-5 (Debian 5.5.0-3) 5.4.1 20171010
> >> reproduce:
> >>         git checkout c2cb30bfceceba8a2a0d5713230a250dd6140e22
> >>         # save the attached .config to linux build tree
> >>         make ARCH=x86_64 
> >> 
> > 
> > The below appears to fix.
> > 
> > 
> > --- a/include/linux/cpu.h
> > +++ b/include/linux/cpu.h
> > @@ -150,6 +150,8 @@ static inline void suspend_enable_second
> >  #else /* !CONFIG_PM_SLEEP_SMP */
> >  static inline int disable_nonboot_cpus(void) { return 0; }
> >  static inline void enable_nonboot_cpus(void) {}
> > +static inline int suspend_disable_secondary_cpus(void) { return 0; }
> > +static inline void suspend_enable_secondary_cpus(void) { }
> >  #endif /* !CONFIG_PM_SLEEP_SMP */
> >  
> >  void cpu_startup_entry(enum cpuhp_state state);
> > 
> 
> Oops, thanks for that, it looks okay.

I back-merged the fix into tip:sched/core.

For these bits to make it upstream in the merge window which starts in 
two days, Frederic's questions about this patch need to be addressed:

   Re: [tip:sched/core] sched/isolation: Require a present CPU in housekeeping 
mask

Thanks,

        Ingo

Reply via email to