diff options
author | David S. Miller <davem@davemloft.net> | 2015-02-12 03:48:14 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-12 03:48:14 (GMT) |
commit | 855e7e7174bade3f2b63077a81eea5aab525dbf6 (patch) | |
tree | 3423eb92315865d76cb8d488513bfef6ab9251d0 /drivers/iommu/amd_iommu_init.c | |
parent | e09dcd2e7913aa50b5cb4836bc1e990e429e4aff (diff) | |
parent | 59d53737a8640482995fea13c6e2c0fd016115d6 (diff) | |
download | linux-855e7e7174bade3f2b63077a81eea5aab525dbf6.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
I pushed a version of the crypto iov_iter bug fix that
Al Viro wrote, but Linus put in a different copy of the
same fix into his tree.
I then reverted my commit in net-next, and that's why we have a merge
when pulling in Linus's tree.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/iommu/amd_iommu_init.c')
-rw-r--r-- | drivers/iommu/amd_iommu_init.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index b0522f1..9a20248 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -2014,9 +2014,6 @@ static bool detect_ivrs(void) /* Make sure ACS will be enabled during PCI probe */ pci_request_acs(); - if (!disable_irq_remap) - amd_iommu_irq_remap = true; - return true; } @@ -2123,12 +2120,14 @@ static int __init iommu_go_to_state(enum iommu_init_state state) #ifdef CONFIG_IRQ_REMAP int __init amd_iommu_prepare(void) { - return iommu_go_to_state(IOMMU_ACPI_FINISHED); -} + int ret; -int __init amd_iommu_supported(void) -{ - return amd_iommu_irq_remap ? 1 : 0; + amd_iommu_irq_remap = true; + + ret = iommu_go_to_state(IOMMU_ACPI_FINISHED); + if (ret) + return ret; + return amd_iommu_irq_remap ? 0 : -ENODEV; } int __init amd_iommu_enable(void) |