diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-03 12:51:21 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-03 12:51:21 -0800 |
commit | a6c872afb2536f47285e6643f4629dec7520041d (patch) | |
tree | 4b54e69fc6594f9afc1277520a350db04e578e77 /lib/dma-debug.c | |
parent | 9fe02668fe48a1d546196bc1392330ff28d9bd57 (diff) | |
parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
download | kernel-crypto-a6c872afb2536f47285e6643f4629dec7520041d.tar.gz kernel-crypto-a6c872afb2536f47285e6643f4629dec7520041d.tar.xz kernel-crypto-a6c872afb2536f47285e6643f4629dec7520041d.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'lib/dma-debug.c')
-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 58a9f9fc609..ce6b7eabf67 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 && |