diff options
| author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2013-07-02 01:45:15 -0400 |
|---|---|---|
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2013-07-02 04:08:22 -0400 |
| commit | f825c736e75b11adb59ec52a4a1096efddd2ec97 (patch) | |
| tree | 0592b3e3cf216341da2daa072874be0fc7d284d9 /include/linux/dma-contiguous.h | |
| parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
mm/cma: Move dma contiguous changes into a seperate config
We want to use CMA for allocating hash page table and real mode area for
PPC64. Hence move DMA contiguous related changes into a seperate config
so that ppc64 can enable CMA without requiring DMA contiguous.
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
[removed defconfig changes]
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'include/linux/dma-contiguous.h')
| -rw-r--r-- | include/linux/dma-contiguous.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma-contiguous.h b/include/linux/dma-contiguous.h index 01b5c84be828..00141d3325fe 100644 --- a/include/linux/dma-contiguous.h +++ b/include/linux/dma-contiguous.h | |||
| @@ -57,7 +57,7 @@ struct cma; | |||
| 57 | struct page; | 57 | struct page; |
| 58 | struct device; | 58 | struct device; |
| 59 | 59 | ||
| 60 | #ifdef CONFIG_CMA | 60 | #ifdef CONFIG_DMA_CMA |
| 61 | 61 | ||
| 62 | /* | 62 | /* |
| 63 | * There is always at least global CMA area and a few optional device | 63 | * There is always at least global CMA area and a few optional device |