aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa/mm/init.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/xtensa/mm/init.c')
-rw-r--r--arch/xtensa/mm/init.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index a534d52a57bd..6190988bba17 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -167,7 +167,7 @@ void __init paging_init(void)
167 167
168 /* All pages are DMA-able, so we put them all in the DMA zone. */ 168 /* All pages are DMA-able, so we put them all in the DMA zone. */
169 169
170 zones_size[ZONE_DMA] = max_low_pfn; 170 zones_size[ZONE_DMA] = max_low_pfn - ARCH_PFN_OFFSET;
171 for (i = 1; i < MAX_NR_ZONES; i++) 171 for (i = 1; i < MAX_NR_ZONES; i++)
172 zones_size[i] = 0; 172 zones_size[i] = 0;
173 173
@@ -179,7 +179,7 @@ void __init paging_init(void)
179 179
180 memset(swapper_pg_dir, 0, PAGE_SIZE); 180 memset(swapper_pg_dir, 0, PAGE_SIZE);
181 181
182 free_area_init(zones_size); 182 free_area_init_node(0, zones_size, ARCH_PFN_OFFSET, NULL);
183} 183}
184 184
185/* 185/*
@@ -220,8 +220,8 @@ void __init mem_init(void)
220 unsigned long codesize, reservedpages, datasize, initsize; 220 unsigned long codesize, reservedpages, datasize, initsize;
221 unsigned long highmemsize, tmp, ram; 221 unsigned long highmemsize, tmp, ram;
222 222
223 max_mapnr = num_physpages = max_low_pfn; 223 max_mapnr = num_physpages = max_low_pfn - ARCH_PFN_OFFSET;
224 high_memory = (void *) __va(max_mapnr << PAGE_SHIFT); 224 high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
225 highmemsize = 0; 225 highmemsize = 0;
226 226
227#ifdef CONFIG_HIGHMEM 227#ifdef CONFIG_HIGHMEM
@@ -231,7 +231,7 @@ void __init mem_init(void)
231 totalram_pages += free_all_bootmem(); 231 totalram_pages += free_all_bootmem();
232 232
233 reservedpages = ram = 0; 233 reservedpages = ram = 0;
234 for (tmp = 0; tmp < max_low_pfn; tmp++) { 234 for (tmp = 0; tmp < max_mapnr; tmp++) {
235 ram++; 235 ram++;
236 if (PageReserved(mem_map+tmp)) 236 if (PageReserved(mem_map+tmp))
237 reservedpages++; 237 reservedpages++;