diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-09-30 10:54:46 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-09-30 10:54:46 +0200 |
commit | 0b429e18c284af3e7a39f8ec44d95116c473fef8 (patch) | |
tree | 7957f57dc70c95a32f71896c9a526ca88b5517ad /include/linux/dma-mapping.h | |
parent | locking/lglock: Remove lglock implementation (diff) | |
parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
download | linux-dev-0b429e18c284af3e7a39f8ec44d95116c473fef8.tar.xz linux-dev-0b429e18c284af3e7a39f8ec44d95116c473fef8.zip |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/dma-mapping.h')
-rw-r--r-- | include/linux/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 66533e18276c..dc69df04abc1 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -718,7 +718,7 @@ static inline int dma_mmap_wc(struct device *dev, #define dma_mmap_writecombine dma_mmap_wc #endif -#ifdef CONFIG_NEED_DMA_MAP_STATE +#if defined(CONFIG_NEED_DMA_MAP_STATE) || defined(CONFIG_DMA_API_DEBUG) #define DEFINE_DMA_UNMAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME #define DEFINE_DMA_UNMAP_LEN(LEN_NAME) __u32 LEN_NAME #define dma_unmap_addr(PTR, ADDR_NAME) ((PTR)->ADDR_NAME) |