diff options
-rw-r--r-- | arch/x86/include/asm/hw_irq.h | 1 | ||||
-rw-r--r-- | drivers/iommu/amd_iommu.c | 1 | ||||
-rw-r--r-- | drivers/iommu/intel_irq_remapping.c | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index 75d0db1db8a0..86e4698a0025 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h | |||
@@ -193,7 +193,6 @@ struct irq_cfg { | |||
193 | u8 vector; | 193 | u8 vector; |
194 | u8 move_in_progress : 1; | 194 | u8 move_in_progress : 1; |
195 | #ifdef CONFIG_IRQ_REMAP | 195 | #ifdef CONFIG_IRQ_REMAP |
196 | u8 remapped : 1; | ||
197 | union { | 196 | union { |
198 | struct irq_2_iommu irq_2_iommu; | 197 | struct irq_2_iommu irq_2_iommu; |
199 | struct irq_2_irte irq_2_irte; | 198 | struct irq_2_irte irq_2_irte; |
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 7d9f5acd06f3..9ebc81dd9d75 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c | |||
@@ -4125,7 +4125,6 @@ static void irq_remapping_prepare_irte(struct amd_ir_data *data, | |||
4125 | union irte *irte = &data->irte_entry; | 4125 | union irte *irte = &data->irte_entry; |
4126 | struct IO_APIC_route_entry *entry; | 4126 | struct IO_APIC_route_entry *entry; |
4127 | 4127 | ||
4128 | irq_cfg->remapped = 1; | ||
4129 | data->irq_2_irte.devid = devid; | 4128 | data->irq_2_irte.devid = devid; |
4130 | data->irq_2_irte.index = index + sub_handle; | 4129 | data->irq_2_irte.index = index + sub_handle; |
4131 | 4130 | ||
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 2697ad6f6a84..9e19800c7ff8 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c | |||
@@ -67,7 +67,6 @@ static int alloc_irte(struct intel_iommu *iommu, int irq, | |||
67 | struct irq_2_iommu *irq_iommu, u16 count) | 67 | struct irq_2_iommu *irq_iommu, u16 count) |
68 | { | 68 | { |
69 | struct ir_table *table = iommu->ir_table; | 69 | struct ir_table *table = iommu->ir_table; |
70 | struct irq_cfg *cfg = irq_cfg(irq); | ||
71 | unsigned int mask = 0; | 70 | unsigned int mask = 0; |
72 | unsigned long flags; | 71 | unsigned long flags; |
73 | int index; | 72 | int index; |
@@ -94,7 +93,6 @@ static int alloc_irte(struct intel_iommu *iommu, int irq, | |||
94 | if (index < 0) { | 93 | if (index < 0) { |
95 | pr_warn("IR%d: can't allocate an IRTE\n", iommu->seq_id); | 94 | pr_warn("IR%d: can't allocate an IRTE\n", iommu->seq_id); |
96 | } else { | 95 | } else { |
97 | cfg->remapped = 1; | ||
98 | irq_iommu->iommu = iommu; | 96 | irq_iommu->iommu = iommu; |
99 | irq_iommu->irte_index = index; | 97 | irq_iommu->irte_index = index; |
100 | irq_iommu->sub_handle = 0; | 98 | irq_iommu->sub_handle = 0; |