From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946154AbbDXP7O (ORCPT ); Fri, 24 Apr 2015 11:59:14 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44760 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966240AbbDXP7J (ORCPT ); Fri, 24 Apr 2015 11:59:09 -0400 Date: Fri, 24 Apr 2015 08:58:05 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: tony.luck@intel.com, benh@kernel.crashing.org, bp@alien8.de, linux-kernel@vger.kernel.org, jroedel@suse.de, mingo@kernel.org, yinghai@kernel.org, gregkh@linuxfoundation.org, sivanich@sgi.com, konrad.wilk@oracle.com, david.a.cohen@linux.intel.com, hpa@zytor.com, jiang.liu@linux.intel.com, tglx@linutronix.de, linux@eikelenboom.it, rjw@rjwysocki.net, rdunlap@infradead.org, david.vrabel@citrix.com, joro@8bytes.org, bhelgaas@google.com Reply-To: rjw@rjwysocki.net, rdunlap@infradead.org, david.vrabel@citrix.com, bhelgaas@google.com, joro@8bytes.org, konrad.wilk@oracle.com, sivanich@sgi.com, gregkh@linuxfoundation.org, tglx@linutronix.de, jiang.liu@linux.intel.com, hpa@zytor.com, david.a.cohen@linux.intel.com, linux@eikelenboom.it, linux-kernel@vger.kernel.org, mingo@kernel.org, jroedel@suse.de, yinghai@kernel.org, tony.luck@intel.com, benh@kernel.crashing.org, bp@alien8.de In-Reply-To: <1428978610-28986-14-git-send-email-jiang.liu@linux.intel.com> References: <1428978610-28986-14-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/irq: Remove irq_cfg.irq_remapped Git-Commit-ID: bac4f90784efb858cfafdd7401dede6ef9563818 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: bac4f90784efb858cfafdd7401dede6ef9563818 Gitweb: http://git.kernel.org/tip/bac4f90784efb858cfafdd7401dede6ef9563818 Author: Jiang Liu AuthorDate: Tue, 14 Apr 2015 10:29:50 +0800 Committer: Thomas Gleixner CommitDate: Fri, 24 Apr 2015 15:36:53 +0200 x86/irq: Remove irq_cfg.irq_remapped Now there is no user of irq_cfg.irq_remapped, so remove it. Signed-off-by: Jiang Liu Tested-by: Joerg Roedel Cc: Konrad Rzeszutek Wilk Cc: David Cohen Cc: Sander Eikelenboom Cc: David Vrabel Cc: Tony Luck Cc: Greg Kroah-Hartman Cc: iommu@lists.linux-foundation.org Cc: Bjorn Helgaas Cc: Benjamin Herrenschmidt Cc: Rafael J. Wysocki Cc: Randy Dunlap Cc: Yinghai Lu Cc: Borislav Petkov Cc: Dimitri Sivanich Cc: Joerg Roedel Link: http://lkml.kernel.org/r/1428978610-28986-14-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/hw_irq.h | 1 - drivers/iommu/amd_iommu.c | 1 - drivers/iommu/intel_irq_remapping.c | 2 -- 3 files changed, 4 deletions(-) diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index 75d0db1..86e4698 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h @@ -193,7 +193,6 @@ struct irq_cfg { u8 vector; u8 move_in_progress : 1; #ifdef CONFIG_IRQ_REMAP - u8 remapped : 1; union { struct irq_2_iommu irq_2_iommu; struct irq_2_irte irq_2_irte; diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 7d9f5ac..9ebc81d 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -4125,7 +4125,6 @@ static void irq_remapping_prepare_irte(struct amd_ir_data *data, union irte *irte = &data->irte_entry; struct IO_APIC_route_entry *entry; - irq_cfg->remapped = 1; data->irq_2_irte.devid = devid; data->irq_2_irte.index = index + sub_handle; diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 2697ad6..9e19800 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -67,7 +67,6 @@ static int alloc_irte(struct intel_iommu *iommu, int irq, struct irq_2_iommu *irq_iommu, u16 count) { struct ir_table *table = iommu->ir_table; - struct irq_cfg *cfg = irq_cfg(irq); unsigned int mask = 0; unsigned long flags; int index; @@ -94,7 +93,6 @@ static int alloc_irte(struct intel_iommu *iommu, int irq, if (index < 0) { pr_warn("IR%d: can't allocate an IRTE\n", iommu->seq_id); } else { - cfg->remapped = 1; irq_iommu->iommu = iommu; irq_iommu->irte_index = index; irq_iommu->sub_handle = 0;