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

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

irq_remapping/amd: Move struct irq_2_irte into amd_iommu.c 



Now only amd_iommu.c access irq_2_irte, so move it from hw_irq.h into
amd_iommu.c.

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-16-git-send-email-jiang.liu@linux.intel.com


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

arch/x86/include/asm/hw_irq.h

+0 −13
Original line number Original line Diff line number Diff line
@@ -94,14 +94,6 @@ extern void trace_call_function_single_interrupt(void); 
#define trace_kvm_posted_intr_ipi kvm_posted_intr_ipi

#define trace_kvm_posted_intr_ipi kvm_posted_intr_ipi

#endif /* CONFIG_TRACING */

#endif /* CONFIG_TRACING */





#ifdef CONFIG_IRQ_REMAP

/* AMD specific interrupt remapping information */

struct irq_2_irte {

	u16 devid; /* Device ID for IRTE table */

	u16 index; /* Index into IRTE table*/

};

#endif	/* CONFIG_IRQ_REMAP */



struct irq_domain;

struct irq_domain;





#ifdef	CONFIG_X86_LOCAL_APIC

#ifdef	CONFIG_X86_LOCAL_APIC
@@ -184,11 +176,6 @@ struct irq_cfg { 
	unsigned int		dest_apicid;

	unsigned int		dest_apicid;

	u8			vector;

	u8			vector;

	u8			move_in_progress : 1;

	u8			move_in_progress : 1;

#ifdef CONFIG_IRQ_REMAP

	union {

		struct irq_2_irte  irq_2_irte;

	};

#endif

	union {

	union {

#ifdef CONFIG_X86_IO_APIC

#ifdef CONFIG_X86_IO_APIC

		struct {

		struct {

drivers/iommu/amd_iommu.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -3852,6 +3852,11 @@ union irte { 
	} fields;

	} fields;

};

};





struct irq_2_irte {

	u16 devid; /* Device ID for IRTE table */

	u16 index; /* Index into IRTE table*/

};



struct amd_ir_data {

struct amd_ir_data {

	struct irq_2_irte			irq_2_irte;

	struct irq_2_irte			irq_2_irte;

	union irte				irte_entry;

	union irte				irte_entry;