diff options
author | 2014-11-12 15:09:01 +0100 | |
---|---|---|
committer | 2014-11-12 15:09:01 +0100 | |
commit | 890ca861f868a10617029ffc87eae7d48ea6876c (patch) | |
tree | 713383f4e3bbd94ddb9816a25e6b3911511908f1 /lib/dma-debug.c | |
parent | x86, msr: Use seek definitions instead of hard-coded values (diff) | |
parent | Linux 3.18-rc4 (diff) | |
download | wireguard-linux-890ca861f868a10617029ffc87eae7d48ea6876c.tar.xz wireguard-linux-890ca861f868a10617029ffc87eae7d48ea6876c.zip |
Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/dma-debug.c')
-rw-r--r-- | lib/dma-debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 98f2d7e91a91..add80cc02dbe 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -1149,7 +1149,7 @@ static void check_unmap(struct dma_debug_entry *ref) static void check_for_stack(struct device *dev, void *addr) { if (object_is_on_stack(addr)) - err_printk(dev, NULL, "DMA-API: device driver maps memory from" + err_printk(dev, NULL, "DMA-API: device driver maps memory from " "stack [addr=%p]\n", addr); } |