Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f201611f authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6ebcc00e

arch/x86_64/kernel/pci-gart.c

+3 −3
Original line number Diff line number Diff line
@@ -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");