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

Commit dc9a7195 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Fix no IOMMU warning in PCI-GART driver 



Complaining about the IOMMU not compiled in doesn't make sense
here because it is clearly compiled in.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6ae53cd4

arch/x86_64/kernel/pci-gart.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -631,10 +631,8 @@ static int __init pci_iommu_init(void) 
		printk(KERN_INFO "PCI-DMA: Disabling IOMMU.\n");

		printk(KERN_INFO "PCI-DMA: Disabling IOMMU.\n");

		if (end_pfn > MAX_DMA32_PFN) {

		if (end_pfn > MAX_DMA32_PFN) {

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

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

					"but IOMMU not compiled in.\n"

					"but IOMMU not available.\n"

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

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

			       KERN_ERR "You might want to enable "

					"CONFIG_GART_IOMMU\n");

		}

		}

		return -1;

		return -1;

	}

	}