]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86, agpgart: scary messages are fortunately obsolete
authorPavel Machek <pavel@ucw.cz>
Tue, 1 Apr 2008 12:24:03 +0000 (14:24 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 4 Apr 2008 16:36:46 +0000 (18:36 +0200)
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>
arch/x86/kernel/pci-gart_64.c

index faf3229f8fb35feed3dd8ee31d521c33086dc621..700e4647dd30214ba33b90845f4121421515948d 100644 (file)
@@ -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;
 }
 
@@ -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;
        }