Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 27031
b: refs/heads/master
c: dc9a719
h: refs/heads/master
i:
  27029: 741677c
  27027: e61177d
  27023: e9e120e
v: v3
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed May 31, 2006
1 parent 62a0584 commit c3fef8b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: 6ae53cd496d36db5f25e6f84b8b9fe7e675999a1
refs/heads/master: dc9a719528d782777b86936b817cc0913d5f0b42
6 changes: 2 additions & 4 deletions trunk/arch/x86_64/kernel/pci-gart.c
Original file line number Diff line number Diff line change
Expand Up @@ -631,10 +631,8 @@ static int __init pci_iommu_init(void)
printk(KERN_INFO "PCI-DMA: Disabling IOMMU.\n");
if (end_pfn > MAX_DMA32_PFN) {
printk(KERN_ERR "WARNING more than 4GB of memory "
"but IOMMU not compiled in.\n"
KERN_ERR "WARNING 32bit PCI may malfunction.\n"
KERN_ERR "You might want to enable "
"CONFIG_GART_IOMMU\n");
"but IOMMU not available.\n"
KERN_ERR "WARNING 32bit PCI may malfunction.\n");
}
return -1;
}
Expand Down

0 comments on commit c3fef8b

Please sign in to comment.