+ x86_64-fix-no-iommu-warning-in-pci-gart-driver.patch added to -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     x86_64: Fix no IOMMU warning in PCI-GART driver

has been added to the -mm tree.  Its filename is

     x86_64-fix-no-iommu-warning-in-pci-gart-driver.patch

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: x86_64: Fix no IOMMU warning in PCI-GART driver
From: "Andi Kleen" <ak@xxxxxxx>


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

Signed-off-by: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 arch/x86_64/kernel/pci-gart.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff -puN arch/x86_64/kernel/pci-gart.c~x86_64-fix-no-iommu-warning-in-pci-gart-driver arch/x86_64/kernel/pci-gart.c
--- devel/arch/x86_64/kernel/pci-gart.c~x86_64-fix-no-iommu-warning-in-pci-gart-driver	2006-05-29 14:16:19.000000000 -0700
+++ devel-akpm/arch/x86_64/kernel/pci-gart.c	2006-05-29 14:16:19.000000000 -0700
@@ -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;
 	}
_

Patches currently in -mm which might be from ak@xxxxxxx are

x86_64-fix-stack-mmap-randomization-for-compat.patch
x86_64-fix-no-iommu-warning-in-pci-gart-driver.patch
i386-apic=-command-line-option-should-always-be.patch
x86_64-fix-last_tsc-calculation-of-pm-timer.patch
x86_64-handle-empty-node-zero.patch
x86_64-fix-off-by-one-in-bad_addr-checking-in.patch
x86_64-dont-do-syscall-exit-tracing-twice.patch
git-acpi.patch
git-agpgart.patch
x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit-fix.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux