From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Yury Norov <yury.norov@gmail•com>,
Catalin Marinas <catalin.marinas@arm•com>,
Will Deacon <will@kernel•org>
Cc: Beata Michalska <beata.michalska@arm•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the bitmap tree
Date: Tue, 18 Feb 2025 16:07:42 +1100 [thread overview]
Message-ID: <20250218160742.49d6ab76@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2798 bytes --]
Hi all,
After merging the bitmap tree, today's linux-next build (arm64 defconfig)
failed like this:
arch/arm64/kernel/topology.c: In function 'arch_freq_get_on_cpu':
arch/arm64/kernel/topology.c:270:43: error: too many arguments to function 'cpumask_next_wrap'
270 | ref_cpu = cpumask_next_wrap(ref_cpu, policy->cpus,
| ^~~~~~~~~~~~~~~~~
In file included from arch/arm64/include/asm/cpufeature.h:27,
from arch/arm64/include/asm/ptrace.h:11,
from arch/arm64/include/asm/irqflags.h:9,
from include/linux/irqflags.h:18,
from include/linux/spinlock.h:59,
from include/linux/mmzone.h:8,
from include/linux/gfp.h:7,
from include/linux/slab.h:16,
from include/linux/resource_ext.h:11,
from include/linux/acpi.h:13,
from arch/arm64/kernel/topology.c:14:
include/linux/cpumask.h:317:14: note: declared here
317 | unsigned int cpumask_next_wrap(int n, const struct cpumask *src)
| ^~~~~~~~~~~~~~~~~
Caused by commits
46ac1bec179d ("cpumask: deprecate cpumask_next_wrap()")
43f7f920e14e ("cpumask: re-introduce cpumask_next{,_and}_wrap()")
65b98ea8b278 ("cpumask: drop cpumask_next_wrap_old()")
interacting with commit
dd871ac1237f ("arm64: Provide an AMU-based version of arch_freq_get_on_cpu")
from the arm64 tree.
I have applied the following patch for today (which may not be correct).
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Tue, 18 Feb 2025 15:44:06 +1100
Subject: [PATCH] fixup for "cpumask: drop cpumask_next_wrap_old()"
interacting with commit
dd871ac1237f ("arm64: Provide an AMU-based version of arch_freq_get_on_cpu")
from the arm64 tree.
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
arch/arm64/kernel/topology.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c
index 6f0cab8e746b..70db234c41a2 100644
--- a/arch/arm64/kernel/topology.c
+++ b/arch/arm64/kernel/topology.c
@@ -231,7 +231,6 @@ void arch_cpu_idle_enter(void)
int arch_freq_get_on_cpu(int cpu)
{
struct amu_cntr_sample *amu_sample;
- unsigned int start_cpu = cpu;
unsigned long last_update;
unsigned int freq = 0;
u64 scale;
@@ -267,8 +266,7 @@ int arch_freq_get_on_cpu(int cpu)
do {
- ref_cpu = cpumask_next_wrap(ref_cpu, policy->cpus,
- start_cpu, false);
+ ref_cpu = cpumask_next_wrap(ref_cpu, policy->cpus);
} while (ref_cpu < nr_cpu_ids && idle_cpu(ref_cpu));
--
2.45.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-02-18 5:07 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-18 5:07 Stephen Rothwell [this message]
2025-02-18 10:35 ` linux-next: build failure after merge of the bitmap tree Beata Michalska
2025-02-18 13:49 ` Stephen Rothwell
2025-02-18 14:10 ` Catalin Marinas
2025-02-18 14:16 ` Yury Norov
2025-02-18 18:23 ` Catalin Marinas
2025-02-18 19:28 ` Beata Michalska
2025-02-18 19:44 ` Catalin Marinas
-- strict thread matches above, loose matches on Subject: below --
2026-04-30 9:11 Thierry Reding
2026-03-24 15:11 Mark Brown
2026-03-24 17:56 ` Yury Norov
2025-11-25 7:24 Stephen Rothwell
2025-11-25 8:05 ` Geert Uytterhoeven
2025-11-25 8:31 ` Miquel Raynal
2025-11-25 8:37 ` Geert Uytterhoeven
2025-11-25 14:44 ` Yury Norov
2025-11-25 14:55 ` Miquel Raynal
2025-11-25 8:53 ` Miquel Raynal
2025-11-28 8:17 ` Miquel Raynal
2024-05-08 6:27 Stephen Rothwell
2024-05-08 13:24 ` Kuan-Wei Chiu
2024-05-08 22:18 ` Yury Norov
2023-10-20 4:49 Stephen Rothwell
2023-10-19 6:01 Stephen Rothwell
2023-10-19 15:58 ` Yury Norov
2023-10-20 4:24 ` Yury Norov
2023-10-20 4:51 ` Stephen Rothwell
2023-10-20 12:33 ` Yury Norov
2023-11-02 11:41 ` Alexander Lobakin
2022-09-26 23:53 broonie
2022-09-27 0:37 ` Yury Norov
2022-09-27 18:56 ` Mark Brown
2022-09-20 8:08 Stephen Rothwell
2022-09-20 14:49 ` Yury Norov
2022-07-27 10:29 Stephen Rothwell
2022-07-22 9:16 Stephen Rothwell
2022-07-22 19:29 ` Yury Norov
2022-07-15 10:29 Stephen Rothwell
2022-07-08 7:47 Stephen Rothwell
2022-05-02 8:15 Stephen Rothwell
2022-04-19 4:29 Stephen Rothwell
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=20250218160742.49d6ab76@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=beata.michalska@arm$(echo .)com \
--cc=catalin.marinas@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=will@kernel$(echo .)org \
--cc=yury.norov@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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