]> err.no Git - linux-2.6/commitdiff
[PATCH] x86_64: Use -ENODEV in IOMMU initialization
authorAndi Kleen <ak@suse.de>
Mon, 26 Jun 2006 11:56:49 +0000 (13:56 +0200)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 26 Jun 2006 17:48:15 +0000 (10:48 -0700)
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 <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/x86_64/kernel/pci-gart.c

index ded3af3bceece6d52537f3b30d01a9f4267b5e30..82a346e6e2e4ce2933a4d78d9fdf70f69be52348 100644 (file)
@@ -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");