diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-11-03 16:54:14 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-11-03 16:54:14 +0100 |
commit | 1d87cff407ceddf0bc4e825949a4b1bf645418bd (patch) | |
tree | fc099ab5881ac0822ecec83e3684cf3686715730 /lib | |
parent | 05154752cf3767c544b65b5e340793d40b3f1229 (diff) | |
parent | 342688f9db392ec82ab9e6b25a6137f9ee1647d7 (diff) | |
download | lwn-1d87cff407ceddf0bc4e825949a4b1bf645418bd.tar.gz lwn-1d87cff407ceddf0bc4e825949a4b1bf645418bd.zip |
Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'lib')
-rw-r--r-- | lib/dma-debug.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 58a9f9fc609a..ce6b7eabf674 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -819,9 +819,11 @@ static void check_unmap(struct dma_debug_entry *ref) err_printk(ref->dev, entry, "DMA-API: device driver frees " "DMA memory with different CPU address " "[device address=0x%016llx] [size=%llu bytes] " - "[cpu alloc address=%p] [cpu free address=%p]", + "[cpu alloc address=0x%016llx] " + "[cpu free address=0x%016llx]", ref->dev_addr, ref->size, - (void *)entry->paddr, (void *)ref->paddr); + (unsigned long long)entry->paddr, + (unsigned long long)ref->paddr); } if (ref->sg_call_ents && ref->type == dma_debug_sg && |