[MIPS] Select ZONE_DMA only if GENERIC_ISA_DMA selected

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

2 files changed, 9 insertions, 11 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index acceae0e8319..f9c4ba58d384 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -10,7 +10,6 @@ menu "Machine selection"
 
 config ZONE_DMA
         bool
-        default y
 
 choice
         prompt "System type"
@@ -923,6 +922,7 @@ config SYS_HAS_EARLY_PRINTK
 
 config GENERIC_ISA_DMA
         bool
+        select ZONE_DMA
 
 config I8259
         bool
@@ -946,6 +946,7 @@ config MIPS_DISABLE_OBSOLETE_IDE
 
 config GENERIC_ISA_DMA_SUPPORT_BROKEN
         bool
+        select ZONE_DMA
 
 #
 # Endianess selection.  Sufficiently obscure so many users don't know what to
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index e9951c0e689f..8800c88cbbf6 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -351,18 +351,15 @@ void __init paging_init(void)
 #endif
         kmap_coherent_init();
 
-#ifdef CONFIG_ISA
-        if (max_low_pfn >= MAX_DMA_PFN)
-                if (min_low_pfn >= MAX_DMA_PFN) {
-                        zones_size[ZONE_DMA] = 0;
-                        zones_size[ZONE_NORMAL] = max_low_pfn - min_low_pfn;
-                } else {
-                        zones_size[ZONE_DMA] = MAX_DMA_PFN - min_low_pfn;
-                        zones_size[ZONE_NORMAL] = max_low_pfn - MAX_DMA_PFN;
-                }
+#ifdef CONFIG_ZONE_DMA
+        if (min_low_pfn < MAX_DMA_PFN && MAX_DMA_PFN <= max_low_pfn) {
+                zones_size[ZONE_DMA] = MAX_DMA_PFN - min_low_pfn;
+                zones_size[ZONE_NORMAL] = max_low_pfn - MAX_DMA_PFN;
+        } else if (max_low_pfn < MAX_DMA_PFN)
+                zones_size[ZONE_DMA] = max_low_pfn - min_low_pfn;
         else
 #endif
-        zones_size[ZONE_DMA] = max_low_pfn - min_low_pfn;
+        zones_size[ZONE_NORMAL] = max_low_pfn - min_low_pfn;
 
 #ifdef CONFIG_HIGHMEM
         zones_size[ZONE_HIGHMEM] = highend_pfn - highstart_pfn;