From: Andrew Morton <akpm@osdl.org>

- Use DMA_32BIT_MASK

- Use %z for size_t

- 80-cols

Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/x86_64/kernel/pci-nommu.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff -puN arch/x86_64/kernel/pci-nommu.c~x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit-fix arch/x86_64/kernel/pci-nommu.c
--- devel/arch/x86_64/kernel/pci-nommu.c~x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit-fix	2006-05-21 14:41:33.000000000 -0700
+++ devel-akpm/arch/x86_64/kernel/pci-nommu.c	2006-05-21 14:41:33.000000000 -0700
@@ -4,6 +4,8 @@
 #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>
@@ -12,10 +14,11 @@ 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 >= 0xffffffffULL)
+		if (*hwdev->dma_mask >= DMA_32BIT_MASK)
 			printk(KERN_ERR
-			    "nommu_%s: overflow %Lx+%lu of device mask %Lx\n",
-	       			name, (long long)bus, size, (long long)*hwdev->dma_mask);
+			    "nommu_%s: overflow %Lx+%zu of device mask %Lx\n",
+				name, (long long)bus, size,
+				(long long)*hwdev->dma_mask);
 		return 0;
 	}
 	return 1;
_