Skip to content

Commit

Permalink
x86, agpgart: scary messages are fortunately obsolete
Browse files Browse the repository at this point in the history
Fix obsolete printks in aperture-64. We used not to handle missing
agpgart, but we handle it okay now.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Pavel Machek authored and Ingo Molnar committed Apr 4, 2008
1 parent bbc60c1 commit 8f59610
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/x86/kernel/pci-gart_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -615,8 +615,8 @@ static __init int init_k8_gatt(struct agp_kern_info *info)

nommu:
/* Should not happen anymore */
printk(KERN_ERR "PCI-DMA: More than 4GB of RAM and no IOMMU\n"
KERN_ERR "PCI-DMA: 32bit PCI IO may malfunction.\n");
printk(KERN_WARNING "PCI-DMA: More than 4GB of RAM and no IOMMU\n"
KERN_WARNING "falling back to iommu=soft.\n");
return -1;
}

Expand Down Expand Up @@ -692,9 +692,9 @@ void __init gart_iommu_init(void)
!gart_iommu_aperture ||
(no_agp && init_k8_gatt(&info) < 0)) {
if (end_pfn > MAX_DMA32_PFN) {
printk(KERN_ERR "WARNING more than 4GB of memory "
"but GART IOMMU not available.\n"
KERN_ERR "WARNING 32bit PCI may malfunction.\n");
printk(KERN_WARNING "More than 4GB of memory "
"but GART IOMMU not available.\n"
KERN_WARNING "falling back to iommu=soft.\n");
}
return;
}
Expand Down

0 comments on commit 8f59610

Please sign in to comment.