X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fx86_64%2Fkernel%2Fpci-nommu.c;fp=arch%2Fx86_64%2Fkernel%2Fpci-nommu.c;h=44adcc2d5e5be43299d8f640161c6ec50658c285;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=aad7609d8e9249e6d9121128e723838a4e508da6;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/x86_64/kernel/pci-nommu.c b/arch/x86_64/kernel/pci-nommu.c
index aad7609d8..44adcc2d5 100644
--- a/arch/x86_64/kernel/pci-nommu.c
+++ b/arch/x86_64/kernel/pci-nommu.c
@@ -4,8 +4,6 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/string.h>
-#include <linux/dma-mapping.h>
-
 #include <asm/proto.h>
 #include <asm/processor.h>
 #include <asm/dma.h>
@@ -14,11 +12,9 @@ static int
 check_addr(char *name, struct device *hwdev, dma_addr_t bus, size_t size)
 {
         if (hwdev && bus + size > *hwdev->dma_mask) {
-		if (*hwdev->dma_mask >= DMA_32BIT_MASK)
-			printk(KERN_ERR
-			    "nommu_%s: overflow %Lx+%zu of device mask %Lx\n",
-				name, (long long)bus, size,
-				(long long)*hwdev->dma_mask);
+		printk(KERN_ERR
+		    "nommu_%s: overflow %Lx+%lu of device mask %Lx\n",
+	       name, (long long)bus, size, (long long)*hwdev->dma_mask);
 		return 0;
 	}
 	return 1;
@@ -92,7 +88,5 @@ void __init no_iommu_init(void)
 {
 	if (dma_ops)
 		return;
-
-	force_iommu = 0; /* no HW IOMMU */
 	dma_ops = &nommu_dma_ops;
 }