diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-10-14 20:13:04 +0200 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2018-10-15 21:36:20 +0200 |
| commit | fe278d1a959283c185ceef0703d8570bf907b95d (patch) | |
| tree | 5cbcd0f2c8447ba32cbbac9131a28febb78a123a | |
| parent | Linux 4.19-rc8 (diff) | |
| download | linux-fe278d1a959283c185ceef0703d8570bf907b95d.tar.xz linux-fe278d1a959283c185ceef0703d8570bf907b95d.zip | |
xtensa: remove ZONE_DMA
ZONE_DMA is intended for magic < 32-bit pools (usually ISA DMA), which
isn't required on xtensa. Move all the non-highmem memory into
ZONE_NORMAL instead to match other architectures.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
| -rw-r--r-- | arch/xtensa/Kconfig | 3 | ||||
| -rw-r--r-- | arch/xtensa/mm/init.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index b9ad83a0ee5d..00b9a734048b 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -config ZONE_DMA - def_bool y - config XTENSA def_bool y select ARCH_HAS_SG_CHAIN diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c index 34aead7dcb48..b385e6b73065 100644 --- a/arch/xtensa/mm/init.c +++ b/arch/xtensa/mm/init.c @@ -71,7 +71,7 @@ void __init zones_init(void) { /* All pages are DMA-able, so we put them all in the DMA zone. */ unsigned long zones_size[MAX_NR_ZONES] = { - [ZONE_DMA] = max_low_pfn - ARCH_PFN_OFFSET, + [ZONE_NORMAL] = max_low_pfn - ARCH_PFN_OFFSET, #ifdef CONFIG_HIGHMEM [ZONE_HIGHMEM] = max_pfn - max_low_pfn, #endif |