From 0a51e5e17bfd82926fdd9b170db39e4f1ca8c9e2 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Fri, 8 Nov 2024 17:34:32 +0000
Subject: [PATCH] x86/mach-apic: Move generic_*_probe() declarations into
 genapic.h

... as the implementations are in genapic/probe.c

This covers the only functions that both setup.c and boot.c were including
mach_apic.h for, although setup.c was depending on io_apic.h transitively too.

The happens to address two MISRA Rule 8.4 violations, as probe.c couldn't
previously see the declarations.

No functional change.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
 xen/arch/x86/acpi/boot.c                          | 2 +-
 xen/arch/x86/include/asm/genapic.h                | 3 +++
 xen/arch/x86/include/asm/mach-generic/mach_apic.h | 3 ---
 xen/arch/x86/setup.c                              | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c
index 170f9783c5..3901f9d982 100644
--- a/xen/arch/x86/acpi/boot.c
+++ b/xen/arch/x86/acpi/boot.c
@@ -38,7 +38,7 @@
 #include <asm/mpspec.h>
 #include <asm/processor.h>
 #include <asm/hpet.h> /* for hpet_address */
-#include <mach_apic.h>
+#include <asm/genapic.h>
 
 #define PREFIX			"ACPI: "
 
diff --git a/xen/arch/x86/include/asm/genapic.h b/xen/arch/x86/include/asm/genapic.h
index 4d39fb9a24..6c8845d17d 100644
--- a/xen/arch/x86/include/asm/genapic.h
+++ b/xen/arch/x86/include/asm/genapic.h
@@ -51,4 +51,7 @@ unsigned int cf_check cpu_mask_to_apicid_phys(const cpumask_t *cpumask);
 void cf_check send_IPI_mask_phys(const cpumask_t *mask, int vector);
 const cpumask_t *cf_check vector_allocation_cpumask_phys(int cpu);
 
+void generic_apic_probe(void);
+void generic_bigsmp_probe(void);
+
 #endif
diff --git a/xen/arch/x86/include/asm/mach-generic/mach_apic.h b/xen/arch/x86/include/asm/mach-generic/mach_apic.h
index c0d8b232c9..50f39b72cc 100644
--- a/xen/arch/x86/include/asm/mach-generic/mach_apic.h
+++ b/xen/arch/x86/include/asm/mach-generic/mach_apic.h
@@ -39,9 +39,6 @@ static inline int multi_timer_check(int apic, int irq)
 	return 0;
 }
 
-extern void generic_apic_probe(void);
-extern void generic_bigsmp_probe(void);
-
 /*
  * The following functions based around phys_cpu_present_map are disabled in
  * some i386 Linux subarchitectures, and in x86_64 'cluster' genapic mode. I'm
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index eac8488c4c..4feef9f2e0 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -46,7 +46,8 @@
 #include <xsm/xsm.h>
 #include <asm/tboot.h>
 #include <asm/bzimage.h> /* for bzimage_headroom */
-#include <asm/mach-generic/mach_apic.h> /* for generic_apic_probe */
+#include <asm/genapic.h>
+#include <asm/io_apic.h>
 #include <asm/setup.h>
 #include <xen/cpu.h>
 #include <xen/cpuidle.h>
-- 
2.39.5