From: Matthew Wilcox <willy@infradead.org>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: Sasha Levin <sashal@kernel.org>,
stable@vger.kernel.org, Rik van Riel <riel@surriel.com>,
Mel Gorman <mgorman@techsingularity.net>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org
Subject: Re: FAILED: Patch "bounds: support non-power-of-two CONFIG_NR_CPUS" failed to apply to 5.4-stable tree
Date: Tue, 2 Apr 2024 06:33:55 +0100 [thread overview]
Message-ID: <ZguYw9Dke_uq5UZU@casper.infradead.org> (raw)
In-Reply-To: <2024032959-ladies-circling-3a5e@gregkh>
On Fri, Mar 29, 2024 at 06:05:20PM +0100, Greg KH wrote:
> On Fri, Mar 29, 2024 at 02:34:43PM +0100, Greg KH wrote:
> > On Wed, Mar 27, 2024 at 02:10:10PM +0000, Matthew Wilcox wrote:
> > > On Wed, Mar 27, 2024 at 08:21:25AM -0400, Sasha Levin wrote:
> > > > The patch below does not apply to the 5.4-stable tree.
> > > > If someone wants it applied there, or to any other stable or longterm
> > > > tree, then please email the backport, including the original git commit
> > > > id to <stable@vger.kernel.org>.
> > >
> > > Looks like you just need a little more fuzz on the patch.
> > >
> > > diff --git a/kernel/bounds.c b/kernel/bounds.c
> > > index 9795d75b09b2..a94e3769347e 100644
> > > --- a/kernel/bounds.c
> > > +++ b/kernel/bounds.c
> > > @@ -19,7 +19,7 @@ int main(void)
> > > DEFINE(NR_PAGEFLAGS, __NR_PAGEFLAGS);
> > > DEFINE(MAX_NR_ZONES, __MAX_NR_ZONES);
> > > #ifdef CONFIG_SMP
> > > - DEFINE(NR_CPUS_BITS, ilog2(CONFIG_NR_CPUS));
> > > + DEFINE(NR_CPUS_BITS, bits_per(CONFIG_NR_CPUS));
> > > #endif
> > > DEFINE(SPINLOCK_SIZE, sizeof(spinlock_t));
> > > /* End of constants */
> >
> > Now fuzzed, thanks.
>
> But it breaks the build on 4.19.y, so I'll go drop it from there. If
> you want it added there, please provide a working fix.
Looks like bits_per() didn't exist in 4.19. It was added as part of commit 69842cba9ace84849bb9b8edcdf2cefccd97901c
Author: Patrick Bellasi <patrick.bellasi@arm.com>
Date: Fri Jun 21 09:42:02 2019 +0100
sched/uclamp: Add CPU's clamp buckets refcounting
Up to you; I can provide bits_per() to 4.19 which will aid backporting
other fixes (we currently have 17 uses of bits_per() in 6.9), or we can
just drop this whole thing for 4.19.
next prev parent reply other threads:[~2024-04-02 5:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-27 12:21 Sasha Levin
2024-03-27 14:10 ` Matthew Wilcox
2024-03-29 13:34 ` Greg KH
2024-03-29 17:05 ` Greg KH
2024-04-02 5:33 ` Matthew Wilcox [this message]
2024-04-05 6:36 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZguYw9Dke_uq5UZU@casper.infradead.org \
--to=willy@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mgorman@techsingularity.net \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=riel@surriel.com \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®