Fix initcall at 0xffffffff806c5b89: pci_iommu_init+0x0/0x53c(): returned with error code -1 Return -ENODEV instead when the IOMMU is not used.
Unified · Split
| @@ -581,7 +581,7 @@ static int __init pci_iommu_init(void) · 580 unmodified lines | |||
| 581 | 581 | ||
| 582 | if (cache_k8_northbridges() < 0 || num_k8_northbridges == 0) { | 582 | if (cache_k8_northbridges() < 0 || num_k8_northbridges == 0) { |
| 583 | printk(KERN_INFO "PCI-GART: No AMD northbridge found.\n"); | 583 | printk(KERN_INFO "PCI-GART: No AMD northbridge found.\n"); |
| 584 | return -1; | 584 | return -ENODEV; |
| 585 | } | 585 | } |
| 586 | 586 | ||
| 587 | #ifndef CONFIG_AGP_AMD64 | 587 | #ifndef CONFIG_AGP_AMD64 |
| @@ -595,7 +595,7 @@ static int __init pci_iommu_init(void) · 7 unmodified lines | |||
| 595 | #endif | 595 | #endif |
| 596 | 596 | ||
| 597 | if (swiotlb) | 597 | if (swiotlb) |
| 598 | return -1; | 598 | return -ENODEV; |
| 599 | 599 | ||
| 600 | if (no_iommu || | 600 | if (no_iommu || |
| 601 | (!force_iommu && end_pfn <= MAX_DMA32_PFN) || | 601 | (!force_iommu && end_pfn <= MAX_DMA32_PFN) || |
| @@ -607,7 +607,7 @@ static int __init pci_iommu_init(void) · 5 unmodified lines | |||
| 607 | "but IOMMU not available.\n" | 607 | "but IOMMU not available.\n" |
| 608 | KERN_ERR "WARNING 32bit PCI may malfunction.\n"); | 608 | KERN_ERR "WARNING 32bit PCI may malfunction.\n"); |
| 609 | } | 609 | } |
| 610 | return -1; | 610 | return -ENODEV; |
| 611 | } | 611 | } |
| 612 | 612 | ||
| 613 | printk(KERN_INFO "PCI-DMA: using GART IOMMU.\n"); | 613 | printk(KERN_INFO "PCI-DMA: using GART IOMMU.\n"); |