vmtest.kbuild: add more 32-bit Arm headers to AArch64 packages

The drgn_test module build started failing on Linux 4.9 on AArch64 again
(maybe because of the new config options?). Add more arch/arm headers
that were being referenced from arch/arm64.

Signed-off-by: Omar Sandoval <osandov@osandov.com>
This commit is contained in:
Omar Sandoval 2024-03-07 12:43:29 -08:00
parent 85bb738a9f
commit 8ac2cbf7b5

View File

@ -346,11 +346,21 @@ class KBuild:
"tools/bpf/resolve_btfids/resolve_btfids", "tools/bpf/resolve_btfids/resolve_btfids",
"tools/objtool/objtool", "tools/objtool/objtool",
] ]
# Before Linux kernel commit bca8f17f57bd ("arm64: Get rid of
# asm/opcodes.h") (in v4.10), AArch64 includes this file from 32-bit
# Arm.
if self._arch.name == "aarch64": if self._arch.name == "aarch64":
files.append("arch/arm/include/asm/opcodes.h") # Before Linux kernel commits bca8f17f57bd ("arm64: Get rid of
# asm/opcodes.h") and 2fbadc3002c5 ("arm/arm64: xen: Move shared
# architecture headers to include/xen/arm" (both in v4.10), AArch64
# included these files from 32-bit Arm.
files.extend(
(
"arch/arm/include/asm/opcodes.h",
"arch/arm/include/asm/xen/hypercall.h",
"arch/arm/include/asm/xen/hypervisor.h",
"arch/arm/include/asm/xen/interface.h",
"arch/arm/include/asm/xen/page-coherent.h",
"arch/arm/include/asm/xen/page.h",
)
)
# Before Linux kernel commit efe0160cfd40 ("powerpc/64: Linker # Before Linux kernel commit efe0160cfd40 ("powerpc/64: Linker
# on-demand sfpr functions for modules") (in v4.13), this must be # on-demand sfpr functions for modules") (in v4.13), this must be
# available to link into modules. # available to link into modules.