[SRU][C][PATCH 1/3] x86: irq_remapping: Move irq remapping mode enum
Khalid Elmously
khalid.elmously at canonical.com
Wed Apr 3 10:15:21 UTC 2019
From: Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
BugLink: https://bugs.launchpad.net/bugs/1816669
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 at linutronix.de>
Cc: Ingo Molnar <mingo at redhat.com>
Cc: Joerg Roedel <jroedel at suse.de>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
Signed-off-by: Joerg Roedel <jroedel at suse.de>
(cherry picked from commit 818b7587b4d34e989ea6c042eeb8d50ffa5be13e)
Signed-off-by: Khalid Elmously <khalid.elmously at canonical.com>
---
arch/x86/include/asm/irq_remapping.h | 5 +++++
include/linux/dmar.h | 5 -----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/x86/include/asm/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h
index 023b4a9fc846..5f26962eff42 100644
--- 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 44ade0600ad7..f8af1d770520 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -273,11 +273,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
*/
--
2.17.1
More information about the kernel-team
mailing list