From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756093AbbFBJ4u (ORCPT ); Tue, 2 Jun 2015 05:56:50 -0400 Received: from 8bytes.org ([81.169.241.247]:58609 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752983AbbFBJ4l (ORCPT ); Tue, 2 Jun 2015 05:56:41 -0400 From: Joerg Roedel To: iommu@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org, Joerg Roedel , Zhen-Hua Li Subject: [PATCH] iommu/vt-d: Fix compile error when CONFIG_INTEL_IOMMU=n Date: Tue, 2 Jun 2015 11:56:34 +0200 Message-Id: <1433238994-19119-1-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joerg Roedel 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 Cc: Zhen-Hua Li Signed-off-by: Joerg Roedel --- 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.8.4.5