From: Christoph Lameter sh / sh64: Remove ZONE_DMA remains. Both arches do not need ZONE_DMA Signed-off-by: Paul Mundt Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton --- arch/sh/mm/init.c | 16 +--------------- arch/sh64/Kconfig | 3 --- arch/sh64/mm/init.c | 5 +---- 3 files changed, 2 insertions(+), 22 deletions(-) diff -puN arch/sh/mm/init.c~remove-zone_dma-remains-from-sh-sh64 arch/sh/mm/init.c --- a/arch/sh/mm/init.c~remove-zone_dma-remains-from-sh-sh64 +++ a/arch/sh/mm/init.c @@ -167,7 +167,6 @@ void __init paging_init(void) * Setup some defaults for the zone sizes.. these should be safe * regardless of distcontiguous memory or MMU settings. */ - zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT; zones_size[ZONE_NORMAL] = __MEMORY_SIZE >> PAGE_SHIFT; #ifdef CONFIG_HIGHMEM zones_size[ZONE_HIGHMEM] = 0 >> PAGE_SHIFT; @@ -179,7 +178,6 @@ void __init paging_init(void) * the zone sizes accordingly, in addition to turning it on. */ { - unsigned long max_dma, low, start_pfn; pgd_t *pg_dir; int i; @@ -191,19 +189,7 @@ void __init paging_init(void) /* Turn on the MMU */ enable_mmu(); - - /* Fixup the zone sizes */ - start_pfn = START_PFN; - max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; - low = MAX_LOW_PFN; - - if (low < max_dma) { - zones_size[ZONE_DMA] = low - start_pfn; - zones_size[ZONE_NORMAL] = 0; - } else { - zones_size[ZONE_DMA] = max_dma - start_pfn; - zones_size[ZONE_NORMAL] = low - max_dma; - } + zones_size[ZONE_NORMAL] = MAX_LOW_PFN - START_PFN; } #elif defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4) diff -puN arch/sh64/Kconfig~remove-zone_dma-remains-from-sh-sh64 arch/sh64/Kconfig --- a/arch/sh64/Kconfig~remove-zone_dma-remains-from-sh-sh64 +++ a/arch/sh64/Kconfig @@ -36,9 +36,6 @@ config GENERIC_CALIBRATE_DELAY config RWSEM_XCHGADD_ALGORITHM bool -config GENERIC_ISA_DMA - bool - source init/Kconfig menu "System type" diff -puN arch/sh64/mm/init.c~remove-zone_dma-remains-from-sh-sh64 arch/sh64/mm/init.c --- a/arch/sh64/mm/init.c~remove-zone_dma-remains-from-sh-sh64 +++ a/arch/sh64/mm/init.c @@ -118,10 +118,7 @@ void __init paging_init(void) mmu_context_cache = MMU_CONTEXT_FIRST_VERSION; - /* - * All memory is good as ZONE_NORMAL (fall-through) and ZONE_DMA. - */ - zones_size[ZONE_DMA] = MAX_LOW_PFN - START_PFN; + zones_size[ZONE_NORMAL] = MAX_LOW_PFN - START_PFN; NODE_DATA(0)->node_mem_map = NULL; free_area_init_node(0, NODE_DATA(0), zones_size, __MEMORY_START >> PAGE_SHIFT, 0); } _