From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christoffer Dall <cdall@cs•columbia.edu>, Marc Zyngier <maz@kernel•org>
Cc: Oliver Upton <oliver.upton@linux•dev>,
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 kvm-arm tree
Date: Thu, 20 Mar 2025 20:32:03 +1100 [thread overview]
Message-ID: <20250320203203.1de92b98@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2620 bytes --]
Hi all,
After merging the kvm-arm tree, today's linux-next build (arm64 defconfig)
failed like this:
arch/arm64/kernel/cpu_errata.c: In function 'has_impdef_pmuv3':
arch/arm64/kernel/cpu_errata.c:279:38: error: passing argument 1 of 'is_midr_in_range_list' makes pointer from integer without a cast [-Wint-conversion]
279 | return is_midr_in_range_list(read_cpuid_id(), impdef_pmuv3_cpus);
| ^~~~~~~~~~~~~~~
| |
| u32 {aka unsigned int}
arch/arm64/kernel/cpu_errata.c:47:53: note: expected 'const struct midr_range *' but argument is of type 'u32' {aka 'unsigned int'}
47 | bool is_midr_in_range_list(struct midr_range const *ranges)
| ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~
arch/arm64/kernel/cpu_errata.c:279:16: error: too many arguments to function 'is_midr_in_range_list'
279 | return is_midr_in_range_list(read_cpuid_id(), impdef_pmuv3_cpus);
| ^~~~~~~~~~~~~~~~~~~~~
arch/arm64/kernel/cpu_errata.c:47:6: note: declared here
47 | bool is_midr_in_range_list(struct midr_range const *ranges)
| ^~~~~~~~~~~~~~~~~~~~~
Caused by commit
1f561ad4b8f5 ("Merge branch 'kvm-arm64/pv-cpuid' into new-next")
The merge missed fixing up this instance from commit
e1231aacb065 ("arm64: Enable IMP DEF PMUv3 traps on Apple M*")
I have applied the following patch for today (but this should go into
the kvm-arm tree (perhaps squashed into the above merge).
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 20 Mar 2025 20:24:04 +1100
Subject: [PATCH] fix up for "Merge branch 'kvm-arm64/pv-cpuid' into new-next"
interacting with "arm64: Enable IMP DEF PMUv3 traps on Apple M*"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
arch/arm64/kernel/cpu_errata.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index caac9e10a5bb..b55f5f705750 100644
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -276,7 +276,7 @@ static bool has_impdef_pmuv3(const struct arm64_cpu_capabilities *entry, int sco
if (pmuver != ID_AA64DFR0_EL1_PMUVer_IMP_DEF)
return false;
- return is_midr_in_range_list(read_cpuid_id(), impdef_pmuv3_cpus);
+ return is_midr_in_range_list(impdef_pmuv3_cpus);
}
static void cpu_enable_impdef_pmuv3_traps(const struct arm64_cpu_capabilities *__unused)
--
2.45.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-03-20 9:32 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-20 9:32 Stephen Rothwell [this message]
2025-03-20 13:35 ` linux-next: build failure after merge of the kvm-arm tree Oliver Upton
-- strict thread matches above, loose matches on Subject: below --
2025-09-23 15:28 Mark Brown
2025-09-23 16:02 ` Will Deacon
2025-09-23 16:44 ` Will Deacon
2025-09-24 2:37 ` Anshuman Khandual
2025-09-24 7:45 ` Will Deacon
2025-07-29 4:22 Stephen Rothwell
2025-07-29 18:05 ` Oliver Upton
2025-03-06 5:46 Stephen Rothwell
2025-03-06 9:56 ` Shameerali Kolothum Thodi
2025-03-07 0:00 ` Marc Zyngier
2025-03-07 0:51 ` Oliver Upton
2024-02-22 11:03 Stephen Rothwell
2024-02-22 11:11 ` Joey Gouly
2024-02-22 11:40 ` Stephen Rothwell
2024-02-22 13:11 ` Paolo Bonzini
2024-02-22 13:11 ` Paolo Bonzini
2024-02-22 14:31 ` Marc Zyngier
2024-02-22 18:58 ` Oliver Upton
2023-10-05 1:31 Stephen Rothwell
2023-10-05 1:53 ` Oliver Upton
2022-05-05 10:10 Stephen Rothwell
2022-05-05 10:11 ` Stephen Rothwell
2022-05-05 11:27 ` Marc Zyngier
2016-09-23 3:31 Stephen Rothwell
2016-09-23 8:43 ` Marc Zyngier
2014-09-22 4:06 Stephen Rothwell
2014-09-22 5:07 ` Eric Auger
2014-09-22 5:31 ` Eric Auger
[not found] ` <CAEDV+g+qVgG+=1Q7gBCPs8oAjK8rpzpoQ2cPMF0hi5Q1M3Nckw@mail.gmail.com>
2014-09-22 21:26 ` Paolo Bonzini
2014-09-24 6:50 ` Stephen Rothwell
2014-09-24 7:06 ` Christoffer Dall
2014-09-24 10:05 ` Paolo Bonzini
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=20250320203203.1de92b98@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cdall@cs$(echo .)columbia.edu \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maz@kernel$(echo .)org \
--cc=oliver.upton@linux$(echo .)dev \
/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