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>

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index b9ad83a0ee5dbf1604acc3c4edc90698e7eea1a6..00b9a734048b04bd5676d7a90802a9a709ceca51 100644 (file)
--- 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 34aead7dcb4878bf18f48cc2087fd93b5bee95ca..b385e6b73065f9db79d3c2a5ea68eb2189fff7df 100644 (file)
--- 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