summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-05 10:54:08 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-05 10:54:08 -0800
commit411094acb70f171a111710cf32031c749ffdd28c (patch)
treec3e23af4b6a9ac242da85861d59268a8e8812114 /lib
parent8fcf4e5a572af520580b14abd9017760e6fcdada (diff)
parent89240ba059ca468ae7a8346edf7f95082458c2fc (diff)
downloadop-kernel-dev-411094acb70f171a111710cf32031c749ffdd28c.zip
op-kernel-dev-411094acb70f171a111710cf32031c749ffdd28c.tar.gz
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, fs: Fix x86 procfs stack information for threads on 64-bit x86: Add reboot quirk for 3 series Mac mini x86: Fix printk message typo in mtrr cleanup code dma-debug: Fix compile warning with PAE enabled x86/amd-iommu: Un__init function required on shutdown x86/amd-iommu: Workaround for erratum 63
Diffstat (limited to 'lib')
-rw-r--r--lib/dma-debug.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 58a9f9f..ce6b7ea 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 &&
OpenPOWER on IntegriCloud