summaryrefslogtreecommitdiffstats
path: root/drivers/iommu/intel-iommu.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-01-29 09:14:11 +0100
committerIngo Molnar <mingo@kernel.org>2013-01-29 09:14:11 +0100
commite9b6025bf8f16469f417e07507390f2f079d0a99 (patch)
tree755b7120cbef2922fe55bf9915887a4c1b82494f /drivers/iommu/intel-iommu.c
parentx86, kvm: Fix intialization warnings in kvm.c (diff)
parentx86, irq: Move irq_remapped out of x86 core code (diff)
downloadlinux-e9b6025bf8f16469f417e07507390f2f079d0a99.tar.xz
linux-e9b6025bf8f16469f417e07507390f2f079d0a99.zip
Merge tag 'ioapic-cleanups-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu into x86/apic
Pull "x86 IOAPIC code from interrupt remapping details cleanups" from Joerg Roedel: "These patches move all interrupt remapping specific checks out of the x86 core code and replaces the respective call-sites with function pointers. As a result the interrupt remapping code is better abstraced from x86 core interrupt handling code. The code was rebased to v3.8-rc4 and tested on systems with AMD-Vi and Intel VT-d (both capable of interrupt remapping). The systems were tested with IOMMU enabled and with IOMMU disabled. No issues were found." Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/iommu/intel-iommu.c')
-rw-r--r--drivers/iommu/intel-iommu.c2
1 files changed, 2 insertions, 0 deletions
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 @@
#include <asm/cacheflush.h>
#include <asm/iommu.h>
+#include "irq_remapping.h"
+
#define ROOT_SIZE VTD_PAGE_SIZE
#define CONTEXT_SIZE VTD_PAGE_SIZE