diff options
Diffstat (limited to 'arch/sh/mm/init.c')
-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 29bd37b1488e..bf0c263cb6fd 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c | |||
@@ -158,7 +158,6 @@ void __init paging_init(void) | |||
158 | * Setup some defaults for the zone sizes.. these should be safe | 158 | * Setup some defaults for the zone sizes.. these should be safe |
159 | * regardless of distcontiguous memory or MMU settings. | 159 | * regardless of distcontiguous memory or MMU settings. |
160 | */ | 160 | */ |
161 | zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT; | ||
162 | zones_size[ZONE_NORMAL] = __MEMORY_SIZE >> PAGE_SHIFT; | 161 | zones_size[ZONE_NORMAL] = __MEMORY_SIZE >> PAGE_SHIFT; |
163 | #ifdef CONFIG_HIGHMEM | 162 | #ifdef CONFIG_HIGHMEM |
164 | zones_size[ZONE_HIGHMEM] = 0 >> PAGE_SHIFT; | 163 | zones_size[ZONE_HIGHMEM] = 0 >> PAGE_SHIFT; |
@@ -170,8 +169,6 @@ void __init paging_init(void) | |||
170 | * the zone sizes accordingly, in addition to turning it on. | 169 | * the zone sizes accordingly, in addition to turning it on. |
171 | */ | 170 | */ |
172 | { | 171 | { |
173 | unsigned long max_dma, low, start_pfn; | ||
174 | |||
175 | /* We don't need to map the kernel through the TLB, as | 172 | /* We don't need to map the kernel through the TLB, as |
176 | * it is permanatly mapped using P1. So clear the | 173 | * it is permanatly mapped using P1. So clear the |
177 | * entire pgd. */ | 174 | * entire pgd. */ |
@@ -179,19 +176,7 @@ void __init paging_init(void) | |||
179 | 176 | ||
180 | /* Turn on the MMU */ | 177 | /* Turn on the MMU */ |
181 | enable_mmu(); | 178 | enable_mmu(); |
182 | 179 | zones_size[ZONE_NORMAL] = MAX_LOW_PFN - START_PFN; | |
183 | /* Fixup the zone sizes */ | ||
184 | start_pfn = START_PFN; | ||
185 | max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; | ||
186 | low = MAX_LOW_PFN; | ||
187 | |||
188 | if (low < max_dma) { | ||
189 | zones_size[ZONE_DMA] = low - start_pfn; | ||
190 | zones_size[ZONE_NORMAL] = 0; | ||
191 | } else { | ||
192 | zones_size[ZONE_DMA] = max_dma - start_pfn; | ||
193 | zones_size[ZONE_NORMAL] = low - max_dma; | ||
194 | } | ||
195 | } | 180 | } |
196 | 181 | ||
197 | /* Set an initial value for the MMU.TTB so we don't have to | 182 | /* Set an initial value for the MMU.TTB so we don't have to |