From patchwork Fri Jun 5 14:10:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 6554541 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3E9639F6E4 for ; Fri, 5 Jun 2015 14:17:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 52CF1205C6 for ; Fri, 5 Jun 2015 14:17:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 649C1205EA for ; Fri, 5 Jun 2015 14:17:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423371AbbFEORp (ORCPT ); Fri, 5 Jun 2015 10:17:45 -0400 Received: from 8bytes.org ([81.169.241.247]:59083 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423014AbbFEOLM (ORCPT ); Fri, 5 Jun 2015 10:11:12 -0400 Received: by theia.8bytes.org (Postfix, from userid 1000) id D055AF4; Fri, 5 Jun 2015 16:11:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1433513470; bh=EExcBGtBpn0TgrzzZ69rKczhiCdx9BY6WP5aUIvvWt4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J7hKHSzIgqX4JUN3x4vGo50dbvv2nmlW9iwRt4djZOqtVg2oJ4dD4GuTMKoymsd+w nb7pHolZ8288h07jGhRwaQSzyPkpzwxYncpgVaO/V2m+bEKfV5+f4G++CSQjaL+BBo okF22nyJI4hyJJXppHGoFKyXOiuQY07PE2Vg9Za3TaOkU+WW2iJlmP9hehtL0KOPm0 33CFy8Qkp9hguI1CTOyh4AG8QbMsmARl/hlxwZ/xGjGsYarHstEiM56VzpsYYivTnk WJvb4OiNfXn5Z1hXlRXuvZ7USlXP7LFLhdBPIvhSATnw8vW/i8ajp3a1IetO/hEGuv ykoMkUcfqkvXA== From: Joerg Roedel To: iommu@lists.linux-foundation.org Cc: zhen-hual@hp.com, bhe@redhat.com, dwmw2@infradead.org, vgoyal@redhat.com, dyoung@redhat.com, alex.williamson@redhat.com, ddutile@redhat.com, ishii.hironobu@jp.fujitsu.com, indou.takao@jp.fujitsu.com, bhelgaas@google.com, doug.hatch@hp.com, jerry.hoemann@hp.com, tom.vaden@hp.com, li.zhang6@hp.com, lisa.mitchell@hp.com, billsumnerlinux@gmail.com, rwright@hp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, kexec@lists.infradead.org, joro@8bytes.org, jroedel@suse.de Subject: [PATCH 01/17] iommu/vt-d: Fix compile error when CONFIG_INTEL_IOMMU=n Date: Fri, 5 Jun 2015 16:10:47 +0200 Message-Id: <1433513463-19128-2-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433513463-19128-1-git-send-email-joro@8bytes.org> References: <1433513463-19128-1-git-send-email-joro@8bytes.org> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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;