[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <2024032935-antsy-imitation-1453@gregkh>
Date: Fri, 29 Mar 2024 14:34:43 +0100
From: Greg KH <gregkh@...uxfoundation.org>
To: Matthew Wilcox <willy@...radead.org>
Cc: Sasha Levin <sashal@...nel.org>, stable@...r.kernel.org,
Rik van Riel <riel@...riel.com>,
Mel Gorman <mgorman@...hsingularity.net>,
Peter Zijlstra <peterz@...radead.org>,
Ingo Molnar <mingo@...nel.org>,
Andrew Morton <akpm@...ux-foundation.org>,
linux-kernel@...r.kernel.org
Subject: Re: FAILED: Patch "bounds: support non-power-of-two CONFIG_NR_CPUS"
failed to apply to 5.4-stable tree
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@...r.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.
greg k-h
Powered by blists - more mailing lists