diff options
author | Joerg Roedel <joro@8bytes.org> | 2012-09-26 06:44:43 -0400 |
---|---|---|
committer | Joerg Roedel <joro@8bytes.org> | 2013-01-28 06:17:26 -0500 |
commit | 078e1ee26a061663bd7a4773c06b33cdb997380d (patch) | |
tree | bb3b9dd3b48acc3b9c4f4152f9eb58879f5efad8 /drivers | |
parent | 1d254428c0ba30a0fbb8112d875ba64f4e60db25 (diff) |
x86, irq: Move irq_remapping_enabled declaration to iommu code
Remove the last left-over from this flag from x86 code.
Signed-off-by: Joerg Roedel <joro@8bytes.org>
Acked-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/iommu/dmar.c | 2 | ||||
-rw-r--r-- | drivers/iommu/intel-iommu.c | 2 | ||||
-rw-r--r-- | drivers/iommu/irq_remapping.h | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index 86e2f4a62b9a..174bb654453d 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c | |||
@@ -41,6 +41,8 @@ | |||
41 | #include <asm/irq_remapping.h> | 41 | #include <asm/irq_remapping.h> |
42 | #include <asm/iommu_table.h> | 42 | #include <asm/iommu_table.h> |
43 | 43 | ||
44 | #include "irq_remapping.h" | ||
45 | |||
44 | /* No locks are needed as DMA remapping hardware unit | 46 | /* No locks are needed as DMA remapping hardware unit |
45 | * list is constructed at boot time and hotplug of | 47 | * list is constructed at boot time and hotplug of |
46 | * these units are not supported by the architecture. | 48 | * these units are not supported by the architecture. |
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index b9d091157884..64ae948a3802 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c | |||
@@ -46,6 +46,8 @@ | |||
46 | #include <asm/cacheflush.h> | 46 | #include <asm/cacheflush.h> |
47 | #include <asm/iommu.h> | 47 | #include <asm/iommu.h> |
48 | 48 | ||
49 | #include "irq_remapping.h" | ||
50 | |||
49 | #define ROOT_SIZE VTD_PAGE_SIZE | 51 | #define ROOT_SIZE VTD_PAGE_SIZE |
50 | #define CONTEXT_SIZE VTD_PAGE_SIZE | 52 | #define CONTEXT_SIZE VTD_PAGE_SIZE |
51 | 53 | ||
diff --git a/drivers/iommu/irq_remapping.h b/drivers/iommu/irq_remapping.h index 95363acb583f..ecb637670405 100644 --- a/drivers/iommu/irq_remapping.h +++ b/drivers/iommu/irq_remapping.h | |||
@@ -34,6 +34,7 @@ struct msi_msg; | |||
34 | extern int disable_irq_remap; | 34 | extern int disable_irq_remap; |
35 | extern int disable_sourceid_checking; | 35 | extern int disable_sourceid_checking; |
36 | extern int no_x2apic_optout; | 36 | extern int no_x2apic_optout; |
37 | extern int irq_remapping_enabled; | ||
37 | 38 | ||
38 | struct irq_remap_ops { | 39 | struct irq_remap_ops { |
39 | /* Check whether Interrupt Remapping is supported */ | 40 | /* Check whether Interrupt Remapping is supported */ |