diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2009-11-17 01:01:34 -0800 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2009-11-17 01:01:34 -0800 |
| commit | bb9074ff58fe745e4f244f76209241909c82ec9c (patch) | |
| tree | cf6be00ab88b1e315f6b74a896a370440f677599 /lib | |
| parent | 4739a9748e1bd7459f22f7e94e7d85710ca83954 (diff) | |
| parent | 156171c71a0dc4bce12b4408bb1591f8fe32dc1a (diff) | |
| download | blackbird-op-linux-bb9074ff58fe745e4f244f76209241909c82ec9c.tar.gz blackbird-op-linux-bb9074ff58fe745e4f244f76209241909c82ec9c.zip | |
Merge commit 'v2.6.32-rc7'
Resolve the conflict between v2.6.32-rc7 where dn_def_dev_handler
gets a small bug fix and the sysctl tree where I am removing all
sysctl strategy routines.
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 && |
