Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05502339 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

[MIPS] Select ZONE_DMA only if GENERIC_ISA_DMA selected 



Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent f1974653

arch/mips/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -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

arch/mips/mm/init.c

+7 −10
Original line number Diff line number Diff line
@@ -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 {

#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;