From cd7b518680f86cc27f70734f0fc422d827a8523b Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Fri, 8 Nov 2024 19:48:55 +0000
Subject: [PATCH] x86: Move mach-default/io_ports.h to asm/io-ports.h

intercept.c and msi.c don't even need this header.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
 xen/arch/x86/apic.c                                             | 2 +-
 xen/arch/x86/dom0_build.c                                       | 2 +-
 xen/arch/x86/hvm/intercept.c                                    | 1 -
 xen/arch/x86/i8259.c                                            | 2 +-
 .../x86/include/asm/{mach-default/io_ports.h => io-ports.h}     | 0
 xen/arch/x86/io_apic.c                                          | 2 +-
 xen/arch/x86/msi.c                                              | 1 -
 xen/arch/x86/time.c                                             | 2 +-
 8 files changed, 5 insertions(+), 7 deletions(-)
 rename xen/arch/x86/include/asm/{mach-default/io_ports.h => io-ports.h} (100%)

diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
index 8e8ff4d155..bb86a1c161 100644
--- a/xen/arch/x86/apic.c
+++ b/xen/arch/x86/apic.c
@@ -27,6 +27,7 @@
 #include <xen/smp.h>
 #include <xen/softirq.h>
 
+#include <asm/io-ports.h>
 #include <asm/irq-vectors.h>
 #include <asm/mc146818rtc.h>
 #include <asm/microcode.h>
@@ -39,7 +40,6 @@
 #include <asm/io_apic.h>
 #include <asm/genapic.h>
 
-#include <io_ports.h>
 #include <xen/kexec.h>
 #include <asm/guest.h>
 #include <asm/nmi.h>
diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c
index 8d56705a08..72747b9247 100644
--- a/xen/arch/x86/dom0_build.c
+++ b/xen/arch/x86/dom0_build.c
@@ -16,11 +16,11 @@
 #include <asm/dom0_build.h>
 #include <asm/guest.h>
 #include <asm/hpet.h>
+#include <asm/io-ports.h>
 #include <asm/io_apic.h>
 #include <asm/p2m.h>
 #include <asm/setup.h>
 #include <asm/spec_ctrl.h>
-#include <io_ports.h>
 
 struct memsize {
     long nr_pages;
diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c
index 8f82b82b07..da22c38676 100644
--- a/xen/arch/x86/hvm/intercept.c
+++ b/xen/arch/x86/hvm/intercept.c
@@ -17,7 +17,6 @@
 #include <xen/lib.h>
 #include <xen/sched.h>
 #include <asm/current.h>
-#include <io_ports.h>
 #include <xen/event.h>
 #include <xen/iommu.h>
 
diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c
index a14f20bdf6..5c7e21a751 100644
--- a/xen/arch/x86/i8259.c
+++ b/xen/arch/x86/i8259.c
@@ -19,9 +19,9 @@
 #include <xen/delay.h>
 #include <asm/apic.h>
 #include <asm/asm_defns.h>
+#include <asm/io-ports.h>
 #include <asm/irq-vectors.h>
 #include <asm/setup.h>
-#include <io_ports.h>
 
 /*
  * This is the 'legacy' 8259A Programmable Interrupt Controller,
diff --git a/xen/arch/x86/include/asm/mach-default/io_ports.h b/xen/arch/x86/include/asm/io-ports.h
similarity index 100%
rename from xen/arch/x86/include/asm/mach-default/io_ports.h
rename to xen/arch/x86/include/asm/io-ports.h
diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index 12cc4a561d..d44d2c9a41 100644
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -34,6 +34,7 @@
 #include <asm/apic.h>
 #include <asm/genapic.h>
 #include <asm/hpet.h>
+#include <asm/io-ports.h>
 #include <asm/io_apic.h>
 #include <asm/irq-vectors.h>
 #include <asm/mc146818rtc.h>
@@ -42,7 +43,6 @@
 #include <asm/msi.h>
 #include <asm/setup.h>
 
-#include <io_ports.h>
 #include <public/physdev.h>
 #include <xen/trace.h>
 
diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c
index be5ef99e08..fa72491192 100644
--- a/xen/arch/x86/msi.c
+++ b/xen/arch/x86/msi.c
@@ -33,7 +33,6 @@
 #include <asm/fixmap.h>
 #include <asm/p2m.h>
 
-#include <io_ports.h>
 #include <public/physdev.h>
 #include <xen/iommu.h>
 #include <xsm/xsm.h>
diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index bc9f265941..a9aa335d7c 100644
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -39,7 +39,7 @@
 #include <asm/div64.h>
 #include <asm/acpi.h>
 #include <asm/hpet.h>
-#include <io_ports.h>
+#include <asm/io-ports.h>
 #include <asm/setup.h> /* for early_time_init */
 #include <public/arch-x86/cpuid.h>
 
-- 
2.39.5