diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-05-02 09:48:26 -0700 | 
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-05-02 09:48:26 -0700 | 
| commit | 0337966d121ebebf73a1c346123e8112796e684e (patch) | |
| tree | c0d4388591e72dc5a26ee976a9cbca70f6bafbbd /lib/dma-debug.c | |
| parent | 7c5bb4ac2b76d2a09256aec8a7d584bf3e2b0466 (diff) | |
| parent | 8a038b83e012097a7ac6cfb9f6c5fac1da8fad6e (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 4.12 merge window.
Diffstat (limited to 'lib/dma-debug.c')
| -rw-r--r-- | lib/dma-debug.c | 7 | 
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 8971370bfb16..b157b46cc9a6 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -17,8 +17,10 @@   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   */ +#include <linux/sched/task_stack.h>  #include <linux/scatterlist.h>  #include <linux/dma-mapping.h> +#include <linux/sched/task.h>  #include <linux/stacktrace.h>  #include <linux/dma-debug.h>  #include <linux/spinlock.h> @@ -1155,6 +1157,11 @@ static void check_unmap(struct dma_debug_entry *ref)  			   dir2name[ref->direction]);  	} +	/* +	 * Drivers should use dma_mapping_error() to check the returned +	 * addresses of dma_map_single() and dma_map_page(). +	 * If not, print this warning message. See Documentation/DMA-API.txt. +	 */  	if (entry->map_err_type == MAP_ERR_NOT_CHECKED) {  		err_printk(ref->dev, entry,  			   "DMA-API: device driver failed to check map error"  | 
