aboutsummaryrefslogtreecommitdiff
path: root/lib/dma-debug.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-14 11:32:23 +0200
committerIngo Molnar <mingo@elte.hu>2009-04-14 11:32:30 +0200
commit05cfbd66d07c44865983c8b65ae9d0037d874206 (patch)
tree084b665cc97b47d1592fe76ea0a39a7753288a02 /lib/dma-debug.c
parent31c9a24ec82926fcae49483e53566d231e705057 (diff)
parentef631b0ca01655d24e9ca7e199262c4a46416a26 (diff)
Merge branch 'core/urgent' into core/rcu
Merge reason: new patches to be queued up depend on: ef631b0: rcu: Make hierarchical RCU less IPI-happy Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/dma-debug.c')
-rw-r--r--lib/dma-debug.c8
1 files changed, 4 insertions, 4 deletions
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]);