Commit-ID: 84d0779304b5c45134311dfc31b5a2325ce3ad84 Gitweb: http://git.kernel.org/tip/84d0779304b5c45134311dfc31b5a2325ce3ad84 Author: Joerg Roedel <jroe...@suse.de> AuthorDate: Wed, 7 Jan 2015 15:31:39 +0800 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Thu, 15 Jan 2015 11:24:23 +0100
iommu/amd: Check for irq-remap support amd_iommu_prepare() This allows to get rid of the irq_remapping_supported() function and all its call-backs into the Intel and AMD IOMMU drivers. Signed-off-by: Joerg Roedel <jroe...@suse.de> Signed-off-by: Jiang Liu <jiang....@linux.intel.com> Tested-by: Joerg Roedel <j...@8bytes.org> Cc: Tony Luck <tony.l...@intel.com> Cc: io...@lists.linux-foundation.org Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org> Cc: Yinghai Lu <ying...@kernel.org> Cc: Borislav Petkov <b...@alien8.de> Link: http://lkml.kernel.org/r/1420615903-28253-13-git-send-email-jiang....@linux.intel.com Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- drivers/iommu/amd_iommu_init.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index b0522f1..0039f87 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -2123,6 +2123,9 @@ static int __init iommu_go_to_state(enum iommu_init_state state) #ifdef CONFIG_IRQ_REMAP int __init amd_iommu_prepare(void) { + if (!amd_iommu_irq_remap) + return -1; + return iommu_go_to_state(IOMMU_ACPI_FINISHED); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
