diff options
| author |   Christoph Hellwig <hch@lst.de> | 2019-11-21 18:13:03 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-11-21 18:13:03 +0100 |
| commit | d7293f79caea45c50c0ab4294847e7af96501ced (patch) | |
| tree | 04d55fbe33562f4d242e0445baae55690ebb6682 /arch/arm64/Kconfig | |
| parent | dma-direct: exclude dma_direct_map_resource from the min_low_pfn check (diff) | |
| parent | arm64: mm: reserve CMA and crashkernel in ZONE_DMA32 (diff) | |
| download | linux-dev-d7293f79caea45c50c0ab4294847e7af96501ced.tar.xz linux-dev-d7293f79caea45c50c0ab4294847e7af96501ced.zip | |
Merge branch 'for-next/zone-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into dma-mapping-for-next
Pull in a stable branch from the arm64 tree that adds the zone_dma_bits
variable to avoid creating hard to resolve conflicts with that addition.
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 57606307fe34..ed5706ebf551 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -265,6 +265,10 @@ config GENERIC_CSUM config GENERIC_CALIBRATE_DELAY def_bool y +config ZONE_DMA + bool "Support DMA zone" if EXPERT + default y + config ZONE_DMA32 bool "Support DMA32 zone" if EXPERT default y |