From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43F2FC4332F for ; Wed, 13 Dec 2023 10:15:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233341AbjLMKPW (ORCPT ); Wed, 13 Dec 2023 05:15:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231482AbjLMKPV (ORCPT ); Wed, 13 Dec 2023 05:15:21 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 45150121; Wed, 13 Dec 2023 02:15:27 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E2699C15; Wed, 13 Dec 2023 02:16:12 -0800 (PST) Received: from [192.168.1.3] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 246543F738; Wed, 13 Dec 2023 02:15:26 -0800 (PST) Message-ID: <90b43e2e-4bbc-d1f2-dba5-8c9174e7398f@arm.com> Date: Wed, 13 Dec 2023 10:15:25 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: linux-next: build failure after merge of the arm-perf tree Content-Language: en-US To: Will Deacon , Stephen Rothwell Cc: Catalin Marinas , Linux Kernel Mailing List , Linux Next Mailing List References: <20231213100931.12d9d85e@canb.auug.org.au> <20231213093057.GA31075@willie-the-truck> From: James Clark In-Reply-To: <20231213093057.GA31075@willie-the-truck> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 >> | ^~~~~~~~~~~~~~~ > > 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 #include #include -#include #ifdef CONFIG_ARM_PMU