Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 30463
b: refs/heads/master
c: f201611
h: refs/heads/master
i:
  30461: a802b45
  30459: bcd71cd
  30455: 360c6a5
  30447: 585a595
  30431: a4dc080
  30399: 1779126
  30335: cf471bb
  30207: 589ad07
v: v3
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Jun 26, 2006
1 parent 9d29062 commit cefa3af
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6ebcc00e95fa78218a048a88d8d5ee491aa7d6d0
refs/heads/master: f201611fcecdfa825471dc425ee007997228fae4
6 changes: 3 additions & 3 deletions trunk/arch/x86_64/kernel/pci-gart.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) ||
Expand All @@ -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");
Expand Down

0 comments on commit cefa3af

Please sign in to comment.