hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
Atsushi Nemoto 2007-03-21 00:36:02 +09:00 committed by Ralf Baechle
parent f197465384
commit 0550233933
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/mips/Kconfig
View File

@ -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

13
arch/mips/mm/init.c
View File

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