diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-29 02:20:24 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-29 02:20:24 +0300 |
| commit | 53061afee43bc5041b67a45b6d793e7afdcf9ca7 (patch) | |
| tree | ed7e918bd7323ded4bdd899aded6384488dad9a4 /include | |
| parent | ae6dd8d61913b5341067c7c660e8e91430d22e7c (diff) | |
| parent | 231e97e2b8ec9a1556ced5d8a89cda03a480b179 (diff) | |
| download | linux-53061afee43bc5041b67a45b6d793e7afdcf9ca7.tar.xz | |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton:
"4 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mem-hotplug: use nodes that contain memory as mask in new_node_page()
scripts/recordmcount.c: account for .softirqentry.text
dma-mapping.h: preserve unmap info for CONFIG_DMA_API_DEBUG
mm,ksm: fix endless looping in allocating memory when ksm enable
Diffstat (limited to 'include')
| -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) |