Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Leo Yan <leo.yan@linaro.org>
To:     Arnaldo Carvalho de Melo <acme@redhat.com>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Anshuman Khandual <anshuman.khandual@arm.com>,
        Suzuki K Poulose <suzuki.poulose@arm.com>,
        Will Deacon <will@kernel.org>,
        James Morse <james.morse@arm.com>, linux-kernel@vger.kernel.org
Cc:     Leo Yan <leo.yan@linaro.org>
Subject: [PATCH] tools headers arm64: Fix compilation failure
Date:   Thu, 11 Aug 2022 12:43:41 +0800
Message-Id: <20220811044341.426796-1-leo.yan@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

When build perf tool on x86_64, it reports failure for finding the
header <asm/sysreg.h>:

  In file included from util/arm-spe.c:37:
  util/../../arch/arm64/include/asm/cputype.h:183:10: fatal error: asm/sysreg.h: No such file or directory
    183 | #include <asm/sysreg.h>
        |          ^~~~~~~~~~~~~~
  compilation terminated.

There have no sysreg.h in x86's asm folder, alternatively, this patch
includes the sysreg.h header in the same folder with cputype.h to fix
the compilation failure.

Fixes: 37402d5d061b ("tools headers arm64: Sync arm64's cputype.h with the kernel sources")
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
 tools/arch/arm64/include/asm/cputype.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/arch/arm64/include/asm/cputype.h b/tools/arch/arm64/include/asm/cputype.h
index 8aa0d276a636..cddeada0ca31 100644
--- a/tools/arch/arm64/include/asm/cputype.h
+++ b/tools/arch/arm64/include/asm/cputype.h
@@ -180,7 +180,7 @@
 
 #ifndef __ASSEMBLY__
 
-#include <asm/sysreg.h>
+#include "sysreg.h"
 
 #define read_cpuid(reg)			read_sysreg_s(SYS_ ## reg)
 
-- 
2.34.1