x86: irq_remapping: Move irq remapping mode enum

The enum is currently defined in Intel-specific DMAR header file,
but it is also used by APIC common code. Therefore, move it to
a more appropriate interrupt-remapping common header file.
This will also be used by subsequent patches.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/arch/x86/include/asm/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h
index 023b4a9fc8465e3c643824582d9d77124a2150b3..5f26962eff427d21294389fda52e3ab842f9aeae 100644 (file)
--- a/arch/x86/include/asm/irq_remapping.h
+++ b/arch/x86/include/asm/irq_remapping.h
@@ -33,6 +33,11 @@ enum irq_remap_cap {
        IRQ_POSTING_CAP = 0,
 };
 
+enum {
+       IRQ_REMAP_XAPIC_MODE,
+       IRQ_REMAP_X2APIC_MODE,
+};
+
 struct vcpu_data {
        u64 pi_desc_addr;       /* Physical address of PI Descriptor */
        u32 vector;             /* Guest vector of the interrupt */

diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index e2433bc50210bb3a2b36aaa293d632b201649d72..843a41ba7e280bda1bc70f646254949f3c7e579c 100644 (file)
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -265,11 +265,6 @@ static inline void dmar_copy_shared_irte(struct irte *dst, struct irte *src)
 #define PDA_LOW_BIT    26
 #define PDA_HIGH_BIT   32
 
-enum {
-       IRQ_REMAP_XAPIC_MODE,
-       IRQ_REMAP_X2APIC_MODE,
-};
-
 /* Can't use the common MSI interrupt functions
  * since DMAR is not a pci device
  */