From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946187AbbDXP73 (ORCPT ); Fri, 24 Apr 2015 11:59:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44776 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946111AbbDXP7Y (ORCPT ); Fri, 24 Apr 2015 11:59:24 -0400 Date: Fri, 24 Apr 2015 08:58:22 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: rjw@rjwysocki.net, tglx@linutronix.de, mingo@kernel.org, bhelgaas@google.com, linux-kernel@vger.kernel.org, jroedel@suse.de, gregkh@linuxfoundation.org, rdunlap@infradead.org, yinghai@kernel.org, tony.luck@intel.com, benh@kernel.crashing.org, david.a.cohen@linux.intel.com, bp@alien8.de, sivanich@sgi.com, jiang.liu@linux.intel.com, david.vrabel@citrix.com, hpa@zytor.com, joro@8bytes.org, konrad.wilk@oracle.com, linux@eikelenboom.it Reply-To: bp@alien8.de, jiang.liu@linux.intel.com, sivanich@sgi.com, david.vrabel@citrix.com, hpa@zytor.com, joro@8bytes.org, konrad.wilk@oracle.com, linux@eikelenboom.it, rjw@rjwysocki.net, tglx@linutronix.de, mingo@kernel.org, bhelgaas@google.com, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, jroedel@suse.de, yinghai@kernel.org, rdunlap@infradead.org, tony.luck@intel.com, david.a.cohen@linux.intel.com, benh@kernel.crashing.org In-Reply-To: <1428978610-28986-15-git-send-email-jiang.liu@linux.intel.com> References: <1428978610-28986-15-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] irq_remapping/vt-d: Move struct irq_2_iommu into intel_irq_remapping.c Git-Commit-ID: 099c5c03487f6bca30c628e14e666788dd61fb33 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: 099c5c03487f6bca30c628e14e666788dd61fb33 Gitweb: http://git.kernel.org/tip/099c5c03487f6bca30c628e14e666788dd61fb33 Author: Jiang Liu AuthorDate: Tue, 14 Apr 2015 10:29:51 +0800 Committer: Thomas Gleixner CommitDate: Fri, 24 Apr 2015 15:36:53 +0200 irq_remapping/vt-d: Move struct irq_2_iommu into intel_irq_remapping.c Now only intel_irq_remapping.c access irq_2_iommu, so move it from hw_irq.h into intel_irq_remapping.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-15-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/hw_irq.h | 9 --------- drivers/iommu/intel_irq_remapping.c | 7 +++++++ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index 86e4698..1e0ee10 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h @@ -95,14 +95,6 @@ extern void trace_call_function_single_interrupt(void); #endif /* CONFIG_TRACING */ #ifdef CONFIG_IRQ_REMAP -/* Intel specific interrupt remapping information */ -struct irq_2_iommu { - struct intel_iommu *iommu; - u16 irte_index; - u16 sub_handle; - u8 irte_mask; -}; - /* AMD specific interrupt remapping information */ struct irq_2_irte { u16 devid; /* Device ID for IRTE table */ @@ -194,7 +186,6 @@ struct irq_cfg { u8 move_in_progress : 1; #ifdef CONFIG_IRQ_REMAP union { - struct irq_2_iommu irq_2_iommu; struct irq_2_irte irq_2_irte; }; #endif diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 9e19800..34642d3 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -32,6 +32,13 @@ struct hpet_scope { unsigned int devfn; }; +struct irq_2_iommu { + struct intel_iommu *iommu; + u16 irte_index; + u16 sub_handle; + u8 irte_mask; +}; + struct intel_ir_data { struct irq_2_iommu irq_2_iommu; struct irte irte_entry;