Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bac4f907 authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner
Browse files

x86/irq: Remove irq_cfg.irq_remapped 



Now there is no user of irq_cfg.irq_remapped, so remove it.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Tested-by: default avatarJoerg Roedel <jroedel@suse.de>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: David Cohen <david.a.cohen@linux.intel.com>
Cc: Sander Eikelenboom <linux@eikelenboom.it>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: iommu@lists.linux-foundation.org
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Joerg Roedel <joro@8bytes.org>
Link: http://lkml.kernel.org/r/1428978610-28986-14-git-send-email-jiang.liu@linux.intel.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4c77c983

arch/x86/include/asm/hw_irq.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -193,7 +193,6 @@ struct irq_cfg { 
	u8			vector;

	u8			vector;

	u8			move_in_progress : 1;

	u8			move_in_progress : 1;

#ifdef CONFIG_IRQ_REMAP

#ifdef CONFIG_IRQ_REMAP

	u8			remapped : 1;

	union {

	union {

		struct irq_2_iommu irq_2_iommu;

		struct irq_2_iommu irq_2_iommu;

		struct irq_2_irte  irq_2_irte;

		struct irq_2_irte  irq_2_irte;

drivers/iommu/amd_iommu.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -4125,7 +4125,6 @@ static void irq_remapping_prepare_irte(struct amd_ir_data *data, 
	union irte *irte = &data->irte_entry;

	union irte *irte = &data->irte_entry;

	struct IO_APIC_route_entry *entry;

	struct IO_APIC_route_entry *entry;





	irq_cfg->remapped = 1;

	data->irq_2_irte.devid = devid;

	data->irq_2_irte.devid = devid;

	data->irq_2_irte.index = index + sub_handle;

	data->irq_2_irte.index = index + sub_handle;

drivers/iommu/intel_irq_remapping.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -67,7 +67,6 @@ static int alloc_irte(struct intel_iommu *iommu, int irq, 
		      struct irq_2_iommu *irq_iommu, u16 count)

		      struct irq_2_iommu *irq_iommu, u16 count)

{

{

	struct ir_table *table = iommu->ir_table;

	struct ir_table *table = iommu->ir_table;

	struct irq_cfg *cfg = irq_cfg(irq);

	unsigned int mask = 0;

	unsigned int mask = 0;

	unsigned long flags;

	unsigned long flags;

	int index;

	int index;
@@ -94,7 +93,6 @@ static int alloc_irte(struct intel_iommu *iommu, int irq, 
	if (index < 0) {

	if (index < 0) {

		pr_warn("IR%d: can't allocate an IRTE\n", iommu->seq_id);

		pr_warn("IR%d: can't allocate an IRTE\n", iommu->seq_id);

	} else {

	} else {

		cfg->remapped = 1;

		irq_iommu->iommu = iommu;

		irq_iommu->iommu = iommu;

		irq_iommu->irte_index =  index;

		irq_iommu->irte_index =  index;

		irq_iommu->sub_handle = 0;

		irq_iommu->sub_handle = 0;