diff options
| author | Christoph Lameter <clameter@sgi.com> | 2007-02-10 01:43:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 10:51:18 -0800 |
| commit | 339ba9b15df58199b9783a23af234e947ec9e6ba (patch) | |
| tree | fe9e4c8eeb26a47b6127890d9f10f7f739c35119 /arch/sh/mm | |
| parent | 005928374bf339e0b6783d78da8fd0701631e7ee (diff) | |
| download | linux-3.10-339ba9b15df58199b9783a23af234e947ec9e6ba.tar.gz linux-3.10-339ba9b15df58199b9783a23af234e947ec9e6ba.tar.bz2 linux-3.10-339ba9b15df58199b9783a23af234e947ec9e6ba.zip | |
[PATCH] optional ZONE_DMA: remove ZONE_DMA remains from sh/sh64
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>
Diffstat (limited to 'arch/sh/mm')
| -rw-r--r-- | arch/sh/mm/init.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index 29bd37b1488..bf0c263cb6f 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -158,7 +158,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; @@ -170,8 +169,6 @@ void __init paging_init(void) * 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 * it is permanatly mapped using P1. So clear the * entire pgd. */ @@ -179,19 +176,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; } /* Set an initial value for the MMU.TTB so we don't have to |