diff options
| author |   Chris Zankel <chris@zankel.net> | 2014-10-20 21:26:01 -0700 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-10-20 21:26:01 -0700 |
| commit | a13926db3e5ea5bbac297f59e9f35061f52892d3 (patch) | |
| tree | b794f25550b7dbbe9cc8eda81633df9023b4821c /lib/dma-debug.c | |
| parent | xtensa/uapi: Add definition of TIOC[SG]RS485 (diff) | |
| parent | Linux 3.18-rc1 (diff) | |
| download | wireguard-linux-a13926db3e5ea5bbac297f59e9f35061f52892d3.tar.xz wireguard-linux-a13926db3e5ea5bbac297f59e9f35061f52892d3.zip | |
Merge tag 'v3.18-rc1' into for_next
Linux 3.18-rc1
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); } |