leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] optional ZONE_DMA: remove ZONE_DMA remains from sh/sh64

Browse Source 
sh / sh64: Remove ZONE_DMA remains.

Both arches do not need ZONE_DMA

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Lameter 2007-02-10 01:43:13 -08:00 committed by Linus Torvalds
parent 005928374b
commit 339ba9b15d
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/sh/mm/init.c
View File

@ -158,7 +158,6 @@ void __init paging_init(void)
* Setup some defaults for the zone sizes.. these should be safe * Setup some defaults for the zone sizes.. these should be safe
* regardless of distcontiguous memory or MMU settings. * regardless of distcontiguous memory or MMU settings.
*/ */
zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT;
zones_size[ZONE_NORMAL] = __MEMORY_SIZE >> PAGE_SHIFT; zones_size[ZONE_NORMAL] = __MEMORY_SIZE >> PAGE_SHIFT;
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
zones_size[ZONE_HIGHMEM] = 0 >> PAGE_SHIFT; zones_size[ZONE_HIGHMEM] = 0 >> PAGE_SHIFT;
@ -170,8 +169,6 @@ void __init paging_init(void)
* the zone sizes accordingly, in addition to turning it on. * the zone sizes accordingly, in addition to turning it on.
*/ */
{ {
unsigned long max_dma, low, start_pfn;
/* We don't need to map the kernel through the TLB, as /* We don't need to map the kernel through the TLB, as
* it is permanatly mapped using P1. So clear the * it is permanatly mapped using P1. So clear the
* entire pgd. */ * entire pgd. */
@ -179,19 +176,7 @@ void __init paging_init(void)
/* Turn on the MMU */ /* Turn on the MMU */
enable_mmu(); enable_mmu();
zones_size[ZONE_NORMAL] = MAX_LOW_PFN - START_PFN;
/* 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;
}
} }
/* Set an initial value for the MMU.TTB so we don't have to /* Set an initial value for the MMU.TTB so we don't have to

3
arch/sh64/Kconfig
View File

@ -36,9 +36,6 @@ config GENERIC_CALIBRATE_DELAY
config RWSEM_XCHGADD_ALGORITHM config RWSEM_XCHGADD_ALGORITHM
bool bool
config GENERIC_ISA_DMA
bool
config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U32
bool bool
default n default n

5
arch/sh64/mm/init.c
View File

@ -118,10 +118,7 @@ void __init paging_init(void)
mmu_context_cache = MMU_CONTEXT_FIRST_VERSION; mmu_context_cache = MMU_CONTEXT_FIRST_VERSION;
/* zones_size[ZONE_NORMAL] = MAX_LOW_PFN - START_PFN;
* All memory is good as ZONE_NORMAL (fall-through) and ZONE_DMA.
*/
zones_size[ZONE_DMA] = MAX_LOW_PFN - START_PFN;
NODE_DATA(0)->node_mem_map = NULL; NODE_DATA(0)->node_mem_map = NULL;
free_area_init_node(0, NODE_DATA(0), zones_size, __MEMORY_START >> PAGE_SHIFT, 0); free_area_init_node(0, NODE_DATA(0), zones_size, __MEMORY_START >> PAGE_SHIFT, 0);
} }