Messages in this thread Patch in this message |  | | From | Joerg Roedel <> | Subject | [PATCH 01/17] iommu/vt-d: Fix compile error when CONFIG_INTEL_IOMMU=n | Date | Fri, 5 Jun 2015 16:10:47 +0200 |
| |
From: Joerg Roedel <jroedel@suse.de>
The patches for the Intel IOMMU driver to fix issues with kdump introduced a compile error with:
CONFIG_DMAR_TABLE=y CONFIG_INTEL_IOMMU=n CONFIG_IRQ_REMAP=y
The error manifests as:
drivers/iommu/intel_irq_remapping.c: In function ‘modify_irte’: drivers/iommu/intel_irq_remapping.c:149:11: error: ‘struct intel_iommu’ has no member named ‘pre_enabled_ir’ if (iommu->pre_enabled_ir)
Fix this by moving the declaration of the pre_enabled_ir under #ifdef CONFIG_IRQ_REMAPPING instead of CONFIG_INTEL_IOMMU.
Reported-by: Jim Davis <jim.epost@gmail.com> Cc: Zhen-Hua Li <zhen-hual@hp.com> Signed-off-by: Joerg Roedel <jroedel@suse.de> --- include/linux/intel-iommu.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index d7a0b5d..a81ceee 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -344,8 +344,6 @@ struct intel_iommu { /* whether translation is enabled prior to OS*/ u8 pre_enabled_trans; - /* whether interrupt remapping is enabled prior to OS*/ - u8 pre_enabled_ir; void __iomem *root_entry_old_virt; /* mapped from old root entry */ unsigned long root_entry_old_phys; /* root entry in old kernel */ @@ -357,6 +355,9 @@ struct intel_iommu { #ifdef CONFIG_IRQ_REMAP struct ir_table *ir_table; /* Interrupt remapping info */ + + /* whether interrupt remapping is enabled prior to OS*/ + u8 pre_enabled_ir; #endif struct device *iommu_dev; /* IOMMU-sysfs device */ int node; -- 1.9.1
|  |