[MIPS] Select ZONE_DMA only if GENERIC_ISA_DMA selected (05502339) · Commits · e / devices / android_kernel_teracube_emerald

arch/mips/Kconfig

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,6 @@ menu "Machine selection"

	config ZONE_DMA		config ZONE_DMA
	bool		bool
	default y

	choice		choice
	prompt "System type"		prompt "System type"
	@@ -923,6 +922,7 @@ config SYS_HAS_EARLY_PRINTK

	config GENERIC_ISA_DMA		config GENERIC_ISA_DMA
	bool		bool
			select ZONE_DMA

	config I8259		config I8259
	bool		bool
	@@ -946,6 +946,7 @@ config MIPS_DISABLE_OBSOLETE_IDE

	config GENERIC_ISA_DMA_SUPPORT_BROKEN		config GENERIC_ISA_DMA_SUPPORT_BROKEN
	bool		bool
			select ZONE_DMA

	#		#
	# Endianess selection. Sufficiently obscure so many users don't know what to		# Endianess selection. Sufficiently obscure so many users don't know what to

+7 −10

Original line number	Original line	Diff line number	Diff line
	@@ -351,18 +351,15 @@ void __init paging_init(void)
	#endif		#endif
	kmap_coherent_init();		kmap_coherent_init();

	#ifdef CONFIG_ISA		#ifdef CONFIG_ZONE_DMA
	if (max_low_pfn >= MAX_DMA_PFN)		if (min_low_pfn < MAX_DMA_PFN && MAX_DMA_PFN <= max_low_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_DMA] = MAX_DMA_PFN - min_low_pfn;
	zones_size[ZONE_NORMAL] = max_low_pfn - MAX_DMA_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		else
	#endif		#endif
	zones_size[ZONE_DMA] = max_low_pfn - min_low_pfn;		zones_size[ZONE_NORMAL] = max_low_pfn - min_low_pfn;

	#ifdef CONFIG_HIGHMEM		#ifdef CONFIG_HIGHMEM
	zones_size[ZONE_HIGHMEM] = highend_pfn - highstart_pfn;		zones_size[ZONE_HIGHMEM] = highend_pfn - highstart_pfn;