From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933806AbbDXP7n (ORCPT ); Fri, 24 Apr 2015 11:59:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44793 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933078AbbDXP7j (ORCPT ); Fri, 24 Apr 2015 11:59:39 -0400 Date: Fri, 24 Apr 2015 08:58:39 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: benh@kernel.crashing.org, sivanich@sgi.com, bhelgaas@google.com, joro@8bytes.org, rjw@rjwysocki.net, jroedel@suse.de, gregkh@linuxfoundation.org, bp@alien8.de, linux-kernel@vger.kernel.org, david.a.cohen@linux.intel.com, yinghai@kernel.org, tony.luck@intel.com, konrad.wilk@oracle.com, linux@eikelenboom.it, mingo@kernel.org, jiang.liu@linux.intel.com, rdunlap@infradead.org, tglx@linutronix.de, david.vrabel@citrix.com, hpa@zytor.com Reply-To: david.a.cohen@linux.intel.com, yinghai@kernel.org, linux-kernel@vger.kernel.org, joro@8bytes.org, rjw@rjwysocki.net, jroedel@suse.de, gregkh@linuxfoundation.org, bp@alien8.de, benh@kernel.crashing.org, sivanich@sgi.com, bhelgaas@google.com, hpa@zytor.com, david.vrabel@citrix.com, jiang.liu@linux.intel.com, rdunlap@infradead.org, tglx@linutronix.de, tony.luck@intel.com, konrad.wilk@oracle.com, linux@eikelenboom.it, mingo@kernel.org In-Reply-To: <1428978610-28986-16-git-send-email-jiang.liu@linux.intel.com> References: <1428978610-28986-16-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] irq_remapping/amd: Move struct irq_2_irte into amd_iommu.c Git-Commit-ID: 9c72496698a4dadd406d159f7735851a63ef9412 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: 9c72496698a4dadd406d159f7735851a63ef9412 Gitweb: http://git.kernel.org/tip/9c72496698a4dadd406d159f7735851a63ef9412 Author: Jiang Liu AuthorDate: Tue, 14 Apr 2015 10:29:52 +0800 Committer: Thomas Gleixner CommitDate: Fri, 24 Apr 2015 15:36:53 +0200 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: 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-16-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/hw_irq.h | 13 ------------- drivers/iommu/amd_iommu.c | 5 +++++ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index 1e0ee10..e47bc4d 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h @@ -94,14 +94,6 @@ extern void trace_call_function_single_interrupt(void); #define trace_kvm_posted_intr_ipi kvm_posted_intr_ipi #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; #ifdef CONFIG_X86_LOCAL_APIC @@ -184,11 +176,6 @@ struct irq_cfg { unsigned int dest_apicid; u8 vector; u8 move_in_progress : 1; -#ifdef CONFIG_IRQ_REMAP - union { - struct irq_2_irte irq_2_irte; - }; -#endif union { #ifdef CONFIG_X86_IO_APIC struct { diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 9ebc81d..b5d903c 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -3852,6 +3852,11 @@ union irte { } fields; }; +struct irq_2_irte { + u16 devid; /* Device ID for IRTE table */ + u16 index; /* Index into IRTE table*/ +}; + struct amd_ir_data { struct irq_2_irte irq_2_irte; union irte irte_entry;