Hi Andrew,
On 4/11/2024 9:15 PM, Andrew Cooper wrote:
On 05/04/2024 7:20 pm, Shawn Anastasio wrote:
Conditionalize xen/acpi.h's inclusion of acpi/acpi.h and asm/acpi.h on
CONFIG_ACPI and import ARM's !CONFIG_ACPI stub for acpi_disabled() so
that the header can be included on architectures without ACPI support,
like ppc.
This change revealed some missing #includes across the ARM tree, so fix
those as well.
Suggested-by: Jan Beulich <jbeul...@suse.com>
Signed-off-by: Shawn Anastasio <sanasta...@raptorengineering.com>
---
xen/arch/arm/arm32/mmu/mm.c | 1 +
xen/arch/arm/arm64/smpboot.c | 3 ++-
xen/arch/arm/domain_build.c | 1 -
xen/arch/arm/gic-v2.c | 1 -
xen/arch/arm/gic-v3.c | 2 --
xen/arch/arm/include/asm/acpi.h | 1 -
xen/arch/arm/mmu/setup.c | 1 +
xen/arch/arm/psci.c | 1 +
xen/arch/arm/smpboot.c | 1 +
xen/arch/arm/traps.c | 3 ++-
xen/common/sched/boot-cpupool.c | 2 +-
xen/include/xen/acpi.h | 8 ++++++--
12 files changed, 15 insertions(+), 10 deletions(-)
Pre-push testing found a randconfig error caused by this:
https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/6602857882
Henry diagnosed this as "arm asm/acpi.h includes the arm asm/setup.h
then asm/p2m.h then finally asm/current.h".
pt.c uses smp_processor_id() explicitly, so should include
asm/current.h. I've folded the following delta in to fix the issue,
I tried to build with below diff locally and confirm below diff will fix
the build error reported by the randconfig job of gitlab-ci.
Kind regards,
Henry
diff --git a/xen/arch/arm/mmu/pt.c b/xen/arch/arm/mmu/pt.c
index a7755728aeda..da28d669e796 100644
--- a/xen/arch/arm/mmu/pt.c
+++ b/xen/arch/arm/mmu/pt.c
@@ -11,6 +11,7 @@
#include <xen/sizes.h>
#include <xen/vmap.h>
+#include <asm/current.h>
#include <asm/fixmap.h>
#ifdef NDEBUG
But I suspect this may not be the only instance.
~Andrew
