diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-15 09:50:38 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-15 09:50:41 +0100 |
| commit | 39dc78b6510323848e3356452f7dab9499736978 (patch) | |
| tree | cf8a8fede74e41b203fd00e3ccd21ead2e851442 /lib | |
| parent | 4c49b12853fbb5eff4849b7b6a1e895776f027a1 (diff) | |
| parent | 156171c71a0dc4bce12b4408bb1591f8fe32dc1a (diff) | |
| download | kernel_samsung_smdk4412-39dc78b6510323848e3356452f7dab9499736978.tar.gz kernel_samsung_smdk4412-39dc78b6510323848e3356452f7dab9499736978.tar.bz2 kernel_samsung_smdk4412-39dc78b6510323848e3356452f7dab9499736978.zip | |
Merge commit 'v2.6.32-rc7' into perf/core
Merge reason: pick up perf fixlets
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 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 && |