From: James Clark <james.clark@arm•com>
To: Will Deacon <will@kernel•org>, Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Catalin Marinas <catalin.marinas@arm•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: build failure after merge of the arm-perf tree
Date: Wed, 13 Dec 2023 10:15:25 +0000 [thread overview]
Message-ID: <90b43e2e-4bbc-d1f2-dba5-8c9174e7398f@arm.com> (raw)
In-Reply-To: <20231213093057.GA31075@willie-the-truck>
On 13/12/2023 09:30, Will Deacon wrote:
> Hi Stephen, [+James]
>
> On Wed, Dec 13, 2023 at 10:09:31AM +1100, Stephen Rothwell wrote:
>> After merging the arm-perf tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> In file included from drivers/perf/arm_dmc620_pmu.c:26:
>> include/linux/perf/arm_pmu.h:15:10: fatal error: asm/cputype.h: No such file or directory
>> 15 | #include <asm/cputype.h>
>> | ^~~~~~~~~~~~~~~
>
> Damn, I tested with allnoconfig, defconfig and allmodconfig before I pushed,
> but only for ARCH=arm64. Thanks for reporting this.
>
>> I can't easily tell what caused this - possibly commit
>>
>> a5f4ca68f348 ("perf/arm_dmc620: Remove duplicate format attribute #defines")
>>
>> I have used the arm-perf and arm64 trees from next-20231212 for today
>> (since the arm64 tree merged the arm-perf tree).
>
> That looks likely. I'll try reverting it and see if it resolves the problem
> locally.
>
> Cheers,
>
> Will
Oops sorry about that, I didn't expect that change to break the x86
build so I didn't test it there, but it's because of CONFIG_COMPILE_TEST.
a5f4ca68f348 is the offending commit, and reverting it would fix it (it
was just a tidyup). But this change below also works. That include was
to build ARM_PMU_PROBE which is only used in perf_event_v6.c (and v7)
which both already include asm/cputype.h. Although maybe that would be a
bit of a hack.
diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h
index 337f01674b38..a4876b1c481a 100644
--- a/include/linux/perf/arm_pmu.h
+++ b/include/linux/perf/arm_pmu.h
@@ -12,7 +12,6 @@
#include <linux/perf_event.h>
#include <linux/platform_device.h>
#include <linux/sysfs.h>
-#include <asm/cputype.h>
#ifdef CONFIG_ARM_PMU
next prev parent reply other threads:[~2023-12-13 10:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-12 23:09 linux-next: build failure after merge of the arm-perf tree Stephen Rothwell
2023-12-13 9:30 ` Will Deacon
2023-12-13 10:15 ` James Clark [this message]
2023-12-13 10:56 ` Will Deacon
-- strict thread matches above, loose matches on Subject: below --
2025-03-17 0:21 Stephen Rothwell
2025-03-17 15:13 ` Will Deacon
2025-03-17 21:23 ` Stephen Rothwell
2023-10-09 22:56 Stephen Rothwell
2023-10-10 5:45 ` Ilkka Koskinen
2023-10-10 17:50 ` Will Deacon
2023-10-10 18:14 ` Will Deacon
2023-10-10 20:20 ` Ilkka Koskinen
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=90b43e2e-4bbc-d1f2-dba5-8c9174e7398f@arm.com \
--to=james.clark@arm$(echo .)com \
--cc=catalin.marinas@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=will@kernel$(echo .)org \
/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