Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f59610d authored by Pavel Machek's avatar Pavel Machek Committed by Ingo Molnar
Browse files

x86, agpgart: scary messages are fortunately obsolete 



Fix obsolete printks in aperture-64. We used not to handle missing
agpgart, but we handle it okay now.

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent bbc60c18

arch/x86/kernel/pci-gart_64.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -615,8 +615,8 @@ static __init int init_k8_gatt(struct agp_kern_info *info) 




 nommu:

 nommu:

	/* Should not happen anymore */

	/* Should not happen anymore */

	printk(KERN_ERR "PCI-DMA: More than 4GB of RAM and no IOMMU\n"

	printk(KERN_WARNING "PCI-DMA: More than 4GB of RAM and no IOMMU\n"

	       KERN_ERR "PCI-DMA: 32bit PCI IO may malfunction.\n");

	       KERN_WARNING "falling back to iommu=soft.\n");

	return -1;

	return -1;

}

}
@@ -692,9 +692,9 @@ void __init gart_iommu_init(void) 
	    !gart_iommu_aperture ||

	    !gart_iommu_aperture ||

	    (no_agp && init_k8_gatt(&info) < 0)) {

	    (no_agp && init_k8_gatt(&info) < 0)) {

		if (end_pfn > MAX_DMA32_PFN) {

		if (end_pfn > MAX_DMA32_PFN) {

			printk(KERN_ERR "WARNING more than 4GB of memory "

			printk(KERN_WARNING "More than 4GB of memory "

			       	          "but GART IOMMU not available.\n"

			       	          "but GART IOMMU not available.\n"

			       KERN_ERR "WARNING 32bit PCI may malfunction.\n");

			       KERN_WARNING "falling back to iommu=soft.\n");

		}

		}

		return;

		return;

	}

	}