[xen staging] x86: Drop mach_mpspec.h

[patchbot@xxxxxxx]

commit d4829a20ad0c9cbb3501c98abccf9954ef6a7048
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Fri Nov 8 19:37:46 2024 +0000
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Mon Nov 11 15:25:39 2024 +0000

    x86: Drop mach_mpspec.h
    
    This header is included in exactly one location.  Fold it into mpspec.h
    
    With this done, mach-default/ is empty, so remove the include path.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/arch.mk                                |  1 -
 xen/arch/x86/include/asm/mach-default/mach_mpspec.h | 10 ----------
 xen/arch/x86/include/asm/mpspec.h                   |  7 ++++++-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk
index bf0222687c..9dde8a5756 100644
--- a/xen/arch/x86/arch.mk
+++ b/xen/arch/x86/arch.mk
@@ -3,7 +3,6 @@
 
 export XEN_IMG_OFFSET := 0x200000
 
-CFLAGS += -I$(srctree)/arch/x86/include/asm/mach-default
 CFLAGS += -DXEN_IMG_OFFSET=$(XEN_IMG_OFFSET)
 
 # Prevent floating-point variables from creeping into Xen.
diff --git a/xen/arch/x86/include/asm/mach-default/mach_mpspec.h 
b/xen/arch/x86/include/asm/mach-default/mach_mpspec.h
deleted file mode 100644
index 1a4e3f8c4f..0000000000
--- a/xen/arch/x86/include/asm/mach-default/mach_mpspec.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __ASM_MACH_MPSPEC_H
-#define __ASM_MACH_MPSPEC_H
-
-#define MAX_IRQ_SOURCES 256
-
-/* Generic (i.e. installer) kernels need lots of bus entries. */
-/* Maximum 256 PCI busses, plus 1 ISA bus in each of 4 cabinets. */
-#define MAX_MP_BUSSES 260
-
-#endif /* __ASM_MACH_MPSPEC_H */
diff --git a/xen/arch/x86/include/asm/mpspec.h 
b/xen/arch/x86/include/asm/mpspec.h
index 45e474dfd1..4781c253fa 100644
--- a/xen/arch/x86/include/asm/mpspec.h
+++ b/xen/arch/x86/include/asm/mpspec.h
@@ -3,7 +3,12 @@
 
 #include <xen/cpumask.h>
 #include <asm/mpspec_def.h>
-#include <mach_mpspec.h>
+
+#define MAX_IRQ_SOURCES 256
+
+/* Generic (i.e. installer) kernels need lots of bus entries. */
+/* Maximum 256 PCI busses, plus 1 ISA bus in each of 4 cabinets. */
+#define MAX_MP_BUSSES 260
 
 extern unsigned char mp_bus_id_to_type[MAX_MP_BUSSES];
 
--
generated by git-patchbot for /home/xen/git/xen.git#staging