From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon, 30 Mar 2009 21:08:44 +0000 (-0700)
Subject: dma-debug: fix printk formats (i386)
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=93c36ed8348934b462044d2d60ab345055318933;p=linux-2.6-omap-h63xx.git

dma-debug: fix printk formats (i386)

Fix printk format warnings in dma-debug:

  lib/dma-debug.c:645: warning: format '%016llx' expects type 'long long unsigned int', but argument 6 has type 'dma_addr_t'
  lib/dma-debug.c:662: warning: format '%016llx' expects type 'long long unsigned int', but argument 6 has type 'dma_addr_t'
  lib/dma-debug.c:676: warning: format '%016llx' expects type 'long long unsigned int', but argument 6 has type 'dma_addr_t'
  lib/dma-debug.c:686: warning: format '%016llx' expects type 'long long unsigned int', but argument 6 has type 'dma_addr_t'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 1a992089486..d3da7edc034 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -648,7 +648,7 @@ static void check_sync(struct device *dev, dma_addr_t addr,
 		err_printk(dev, NULL, "DMA-API: device driver tries "
 				"to sync DMA memory it has not allocated "
 				"[device address=0x%016llx] [size=%llu bytes]\n",
-				addr, size);
+				(unsigned long long)addr, size);
 		goto out;
 	}
 
@@ -666,7 +666,7 @@ static void check_sync(struct device *dev, dma_addr_t addr,
 				"DMA memory with different direction "
 				"[device address=0x%016llx] [size=%llu bytes] "
 				"[mapped with %s] [synced with %s]\n",
-				addr, entry->size,
+				(unsigned long long)addr, entry->size,
 				dir2name[entry->direction],
 				dir2name[direction]);
 	}
@@ -680,7 +680,7 @@ static void check_sync(struct device *dev, dma_addr_t addr,
 				"device read-only DMA memory for cpu "
 				"[device address=0x%016llx] [size=%llu bytes] "
 				"[mapped with %s] [synced with %s]\n",
-				addr, entry->size,
+				(unsigned long long)addr, entry->size,
 				dir2name[entry->direction],
 				dir2name[direction]);
 
@@ -690,7 +690,7 @@ static void check_sync(struct device *dev, dma_addr_t addr,
 				"device write-only DMA memory to device "
 				"[device address=0x%016llx] [size=%llu bytes] "
 				"[mapped with %s] [synced with %s]\n",
-				addr, entry->size,
+				(unsigned long long)addr, entry->size,
 				dir2name[entry->direction],
 				dir2name[direction]);