From f201611fcecdfa825471dc425ee007997228fae4 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Mon, 26 Jun 2006 13:56:49 +0200 Subject: [PATCH] [PATCH] x86_64: Use -ENODEV in IOMMU initialization Fix initcall at 0xffffffff806c5b89: pci_iommu_init+0x0/0x53c(): returned with error code -1 Return -ENODEV instead when the IOMMU is not used. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds --- arch/x86_64/kernel/pci-gart.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c index ded3af3bcee..82a346e6e2e 100644 --- a/arch/x86_64/kernel/pci-gart.c +++ b/arch/x86_64/kernel/pci-gart.c @@ -581,7 +581,7 @@ static int __init pci_iommu_init(void) if (cache_k8_northbridges() < 0 || num_k8_northbridges == 0) { printk(KERN_INFO "PCI-GART: No AMD northbridge found.\n"); - return -1; + return -ENODEV; } #ifndef CONFIG_AGP_AMD64 @@ -595,7 +595,7 @@ static int __init pci_iommu_init(void) #endif if (swiotlb) - return -1; + return -ENODEV; if (no_iommu || (!force_iommu && end_pfn <= MAX_DMA32_PFN) || @@ -607,7 +607,7 @@ static int __init pci_iommu_init(void) "but IOMMU not available.\n" KERN_ERR "WARNING 32bit PCI may malfunction.\n"); } - return -1; + return -ENODEV; } printk(KERN_INFO "PCI-DMA: using GART IOMMU.\n"); -- 2.20.1