x86: Move mach-default/irq_vectors.h to asm/irq-vectors.h

irq_vectors.h is included by with multiple paths.  Move it to be a regular
header instead.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
index 8f192f80b8523f7952f3f3805aac03e2407bf321..8e8ff4d155ff85b329f295283003f00eb2cb58db 100644 (file)
--- a/xen/arch/x86/apic.c
+++ b/xen/arch/x86/apic.c
@@ -26,6 +26,8 @@
 #include <xen/delay.h>
 #include <xen/smp.h>
 #include <xen/softirq.h>
+
+#include <asm/irq-vectors.h>
 #include <asm/mc146818rtc.h>
 #include <asm/microcode.h>
 #include <asm/msr.h>
@@ -38,7 +40,6 @@
 #include <asm/genapic.h>
 
 #include <io_ports.h>
-#include <irq_vectors.h>
 #include <xen/kexec.h>
 #include <asm/guest.h>
 #include <asm/nmi.h>

diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c
index a5bb1689c7d59ca9c26197457821080cd06202bf..c28192ea26623ef49ca894ef2f2c14d4775bbeb5 100644 (file)
--- a/xen/arch/x86/cpu/vpmu.c
+++ b/xen/arch/x86/cpu/vpmu.c
@@ -13,13 +13,15 @@
 #include <xen/guest_access.h>
 #include <xen/hypercall.h>
 #include <xen/sched.h>
+
+#include <asm/irq-vectors.h>
 #include <asm/regs.h>
 #include <asm/msr.h>
 #include <asm/nmi.h>
 #include <asm/p2m.h>
 #include <asm/vpmu.h>
 #include <asm/apic.h>
-#include <irq_vectors.h>
+
 #include <public/pmu.h>
 #include <xsm/xsm.h>
 

diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c
index 10ddd2b0fbbfb1443a3c50bf7afeb90ff6f23778..a14f20bdf6765d3885094273c13ac94ee5a655f0 100644 (file)
--- 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/irq-vectors.h>
 #include <asm/setup.h>
 #include <io_ports.h>
-#include <irq_vectors.h>
 
 /*
  * This is the 'legacy' 8259A Programmable Interrupt Controller,

diff --git a/xen/arch/x86/include/asm/irq-vectors.h b/xen/arch/x86/include/asm/irq-vectors.h
new file mode 100644 (file)
index 0000000..f546aed
--- /dev/null
+++ b/xen/arch/x86/include/asm/irq-vectors.h
@@ -0,0 +1,46 @@
+#ifndef _ASM_IRQ_VECTORS_H
+#define _ASM_IRQ_VECTORS_H
+
+/* Processor-initiated interrupts are all high priority. */
+#define SPURIOUS_APIC_VECTOR   0xff
+#define ERROR_APIC_VECTOR      0xfe
+#define INVALIDATE_TLB_VECTOR  0xfd
+#define EVENT_CHECK_VECTOR     0xfc
+#define CALL_FUNCTION_VECTOR   0xfb
+#define LOCAL_TIMER_VECTOR     0xfa
+#define PMU_APIC_VECTOR        0xf9
+/*
+ * High-priority dynamically-allocated vectors. For interrupts that
+ * must be higher priority than any guest-bound interrupt.
+ */
+#define FIRST_HIPRIORITY_VECTOR        0xf1
+#define LAST_HIPRIORITY_VECTOR  0xf8
+/* IRQ0 (timer) is statically allocated but must be high priority. */
+#define IRQ0_VECTOR             0xf0
+
+/* Legacy PIC uses vectors 0x20-0x2f. */
+#define FIRST_LEGACY_VECTOR     FIRST_DYNAMIC_VECTOR
+#define LAST_LEGACY_VECTOR      (FIRST_LEGACY_VECTOR + 0xf)
+
+#ifdef CONFIG_PV32
+#define HYPERCALL_VECTOR        0x82
+#endif
+
+#define LEGACY_SYSCALL_VECTOR   0x80
+
+/*
+ * Dynamically-allocated vectors available to any driver. Note that the
+ * legacy vector range is a sub-range of this one, re-used on CPUs not
+ * sharing vectors with CPU 0.
+ */
+#define FIRST_DYNAMIC_VECTOR    0x20
+#define LAST_DYNAMIC_VECTOR     0xef
+#define NR_DYNAMIC_VECTORS     (LAST_DYNAMIC_VECTOR - FIRST_DYNAMIC_VECTOR + 1)
+
+/* There's no IRQ2 at the PIC. */
+#define IRQ_MOVE_CLEANUP_VECTOR (FIRST_LEGACY_VECTOR + 2)
+
+#define FIRST_IRQ_VECTOR        FIRST_DYNAMIC_VECTOR
+#define LAST_IRQ_VECTOR         LAST_HIPRIORITY_VECTOR
+
+#endif /* _ASM_IRQ_VECTORS_H */

diff --git a/xen/arch/x86/include/asm/mach-default/irq_vectors.h b/xen/arch/x86/include/asm/mach-default/irq_vectors.h
deleted file mode 100644 (file)
index f546aed..0000000
--- a/xen/arch/x86/include/asm/mach-default/irq_vectors.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef _ASM_IRQ_VECTORS_H
-#define _ASM_IRQ_VECTORS_H
-
-/* Processor-initiated interrupts are all high priority. */
-#define SPURIOUS_APIC_VECTOR   0xff
-#define ERROR_APIC_VECTOR      0xfe
-#define INVALIDATE_TLB_VECTOR  0xfd
-#define EVENT_CHECK_VECTOR     0xfc
-#define CALL_FUNCTION_VECTOR   0xfb
-#define LOCAL_TIMER_VECTOR     0xfa
-#define PMU_APIC_VECTOR        0xf9
-/*
- * High-priority dynamically-allocated vectors. For interrupts that
- * must be higher priority than any guest-bound interrupt.
- */
-#define FIRST_HIPRIORITY_VECTOR        0xf1
-#define LAST_HIPRIORITY_VECTOR  0xf8
-/* IRQ0 (timer) is statically allocated but must be high priority. */
-#define IRQ0_VECTOR             0xf0
-
-/* Legacy PIC uses vectors 0x20-0x2f. */
-#define FIRST_LEGACY_VECTOR     FIRST_DYNAMIC_VECTOR
-#define LAST_LEGACY_VECTOR      (FIRST_LEGACY_VECTOR + 0xf)
-
-#ifdef CONFIG_PV32
-#define HYPERCALL_VECTOR        0x82
-#endif
-
-#define LEGACY_SYSCALL_VECTOR   0x80
-
-/*
- * Dynamically-allocated vectors available to any driver. Note that the
- * legacy vector range is a sub-range of this one, re-used on CPUs not
- * sharing vectors with CPU 0.
- */
-#define FIRST_DYNAMIC_VECTOR    0x20
-#define LAST_DYNAMIC_VECTOR     0xef
-#define NR_DYNAMIC_VECTORS     (LAST_DYNAMIC_VECTOR - FIRST_DYNAMIC_VECTOR + 1)
-
-/* There's no IRQ2 at the PIC. */
-#define IRQ_MOVE_CLEANUP_VECTOR (FIRST_LEGACY_VECTOR + 2)
-
-#define FIRST_IRQ_VECTOR        FIRST_DYNAMIC_VECTOR
-#define LAST_IRQ_VECTOR         LAST_HIPRIORITY_VECTOR
-
-#endif /* _ASM_IRQ_VECTORS_H */

diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index 13daebc10a97f00cec28a80a82d4400dd9363bfe..12cc4a561d14776434d5387deaa50c41ed72d18b 100644 (file)
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -35,6 +35,7 @@
 #include <asm/genapic.h>
 #include <asm/hpet.h>
 #include <asm/io_apic.h>
+#include <asm/irq-vectors.h>
 #include <asm/mc146818rtc.h>
 #include <asm/smp.h>
 #include <asm/desc.h>
@@ -42,7 +43,6 @@
 #include <asm/setup.h>
 
 #include <io_ports.h>
-#include <irq_vectors.h>
 #include <public/physdev.h>
 #include <xen/trace.h>
 

diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index 6340cd6dd73daf133f3a484fff20ac3c4f5d1bea..e56bacc88d846afa3fa8417f5a8f4a8acacf2441 100644 (file)
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -25,11 +25,11 @@
 #include <asm/apic.h>
 #include <asm/genapic.h>
 #include <asm/io_apic.h>
+#include <asm/irq-vectors.h>
 #include <asm/msi.h>
 #include <asm/current.h>
 #include <asm/flushtlb.h>
 
-#include <irq_vectors.h>
 #include <public/physdev.h>
 
 /* opt_noirqbalance: If true, software IRQ balancing/affinity is disabled. */

diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c
index 68d6e25178a99d1b92c366f7c91c7732db9c80b2..be5ef99e088f449e57424a43e63a0f2727ca1e3b 100644 (file)
--- a/xen/arch/x86/msi.c
+++ b/xen/arch/x86/msi.c
@@ -26,6 +26,7 @@
 #include <asm/genapic.h>
 #include <asm/io.h>
 #include <asm/io_apic.h>
+#include <asm/irq-vectors.h>
 #include <asm/smp.h>
 #include <asm/desc.h>
 #include <asm/msi.h>
@@ -33,7 +34,6 @@
 #include <asm/p2m.h>
 
 #include <io_ports.h>
-#include <irq_vectors.h>
 #include <public/physdev.h>
 #include <xen/iommu.h>
 #include <xsm/xsm.h>

diff --git a/xen/arch/x86/pv/hypercall.c b/xen/arch/x86/pv/hypercall.c
index 4294e930128bf69bbf8e25e197268a367f954db2..2febade44b73768c7480e16e6b622c79579e57da 100644 (file)
--- a/xen/arch/x86/pv/hypercall.c
+++ b/xen/arch/x86/pv/hypercall.c
@@ -11,9 +11,10 @@
 #include <xen/hypercall.h>
 #include <xen/nospec.h>
 #include <xen/trace.h>
+
 #include <asm/apic.h>
+#include <asm/irq-vectors.h>
 #include <asm/multicall.h>
-#include <irq_vectors.h>
 
 /* Forced inline to cause 'compat' to be evaluated at compile time. */
 static void always_inline

diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c
index ed8aa97382b7c9c3548f8ea90d2e91f41f38a381..fd1597d0bdeaf447223e9fa733738706dc119e63 100644 (file)
--- a/xen/arch/x86/pv/traps.c
+++ b/xen/arch/x86/pv/traps.c
@@ -13,10 +13,10 @@
 #include <xen/softirq.h>
 
 #include <asm/debugreg.h>
+#include <asm/irq-vectors.h>
 #include <asm/pv/trace.h>
 #include <asm/shared.h>
 #include <asm/traps.h>
-#include <irq_vectors.h>
 
 void pv_inject_event(const struct x86_event *event)
 {

diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c
index bd337e548c5a0dc1fa67845277532cf87b9c60c1..02a6ed7593f39a65c147a0633b81df16e27e246a 100644 (file)
--- a/xen/arch/x86/smp.c
+++ b/xen/arch/x86/smp.c
@@ -19,13 +19,13 @@
 #include <asm/current.h>
 #include <asm/genapic.h>
 #include <asm/guest.h>
+#include <asm/irq-vectors.h>
 #include <asm/smp.h>
 #include <asm/mc146818rtc.h>
 #include <asm/flushtlb.h>
 #include <asm/hardirq.h>
 #include <asm/hpet.h>
 #include <asm/setup.h>
-#include <irq_vectors.h>
 
 /* Helper functions to prepare APIC register values. */
 static unsigned int prepare_ICR(unsigned int shortcut, int vector)

diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
index 42272a9844fa735b6155d7f0a877dc0928eeb0a1..568a3abe1f47b46021006ff85308dc7487098874 100644 (file)
--- a/xen/arch/x86/smpboot.c
+++ b/xen/arch/x86/smpboot.c
@@ -39,7 +39,7 @@
 #include <asm/time.h>
 #include <asm/tboot.h>
 #include <asm/trampoline.h>
-#include <irq_vectors.h>
+#include <asm/irq-vectors.h>
 
 unsigned long __read_mostly trampoline_phys;
 enum ap_boot_method __read_mostly ap_boot_method = AP_BOOT_NORMAL;

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index a9c2c607eb08aa91b658af1c2565c67d0a17f3be..fd8a4448e3f7ff5b8d943fe9c15f061fbb50565e 100644 (file)
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -69,7 +69,7 @@
 #include <public/hvm/params.h>
 #include <asm/cpuid.h>
 #include <xsm/xsm.h>
-#include <asm/mach-default/irq_vectors.h>
+#include <asm/irq-vectors.h>
 #include <asm/pv/traps.h>
 #include <asm/pv/trace.h>
 #include <asm/pv/mm.h>

diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S
index a99646c0cd4e3d40dabe73ba27de69889cd557d6..1e87652f4bcbaacc57f1198597fc4cfd4bcd3129 100644 (file)
--- a/xen/arch/x86/x86_64/compat/entry.S
+++ b/xen/arch/x86/x86_64/compat/entry.S
@@ -5,11 +5,11 @@
         .file "x86_64/compat/entry.S"
 
 #include <asm/asm_defns.h>
+#include <asm/irq-vectors.h>
 #include <asm/page.h>
 #include <asm/processor.h>
 #include <asm/desc.h>
 #include <public/xen.h>
-#include <irq_vectors.h>
 
 FUNC(entry_int82)
         ENDBR64

diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
index c5c723b5f4d4d5b1e8f679fbddffef42aadb802f..40d094d5b2eeffa8c2806ff6124ae3426d661a30 100644 (file)
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -7,10 +7,10 @@
         .file "x86_64/entry.S"
 
 #include <asm/asm_defns.h>
+#include <asm/irq-vectors.h>
 #include <asm/page.h>
 #include <asm/processor.h>
 #include <public/xen.h>
-#include <irq_vectors.h>
 
 /* %rsp: struct cpu_user_regs */
 .macro ASSERT_CONTEXT_IS_XEN