patch-2.4.20 linux-2.4.20/arch/mips64/mm/init.c
Next file: linux-2.4.20/arch/mips64/mm/loadmmu.c
Previous file: linux-2.4.20/arch/mips64/mm/fault.c
Back to the patch index
Back to the overall index
- Lines: 50
- Date:
Thu Nov 28 15:53:10 2002
- Orig file:
linux-2.4.19/arch/mips64/mm/init.c
- Orig date:
Fri Aug 2 17:39:43 2002
diff -urN linux-2.4.19/arch/mips64/mm/init.c linux-2.4.20/arch/mips64/mm/init.c
@@ -226,10 +226,10 @@
free_area_init(zones_size);
- memset((void *)kptbl, 0, PAGE_SIZE << KPTBL_PAGE_ORDER);
+ memset((void *)kptbl, 0, PAGE_SIZE << PGD_ORDER);
memset((void *)kpmdtbl, 0, PAGE_SIZE);
pgd_set(swapper_pg_dir, kpmdtbl);
- for (i = 0; i < (1 << KPTBL_PAGE_ORDER); pmd++,i++,pte+=PTRS_PER_PTE)
+ for (i = 0; i < (1 << PGD_ORDER); pmd++,i++,pte+=PTRS_PER_PTE)
pmd_val(*pmd) = (unsigned long)pte;
}
@@ -243,17 +243,18 @@
int i;
for (i = 0; i < boot_mem_map.nr_map; i++) {
- unsigned long addr, end;
+ unsigned long addr, end;
- if (boot_mem_map.map[i].type != BOOT_MEM_RAM)
- /* not usable memory */
- continue;
+ if (boot_mem_map.map[i].type != BOOT_MEM_RAM)
+ /* not usable memory */
+ continue;
+
+ addr = PFN_UP(boot_mem_map.map[i].addr);
+ end = PFN_DOWN(boot_mem_map.map[i].addr +
+ boot_mem_map.map[i].size);
- addr = PFN_UP(boot_mem_map.map[i].addr);
- end = PFN_DOWN(boot_mem_map.map[i].addr + boot_mem_map.map[i].size);
-
- if (pagenr >= addr && pagenr < end)
- return 1;
+ if (pagenr >= addr && pagenr < end)
+ return 1;
}
return 0;
@@ -316,7 +317,7 @@
unsigned long addr, page;
prom_free_prom_memory();
-
+
addr = (unsigned long)(&__init_begin);
while (addr < (unsigned long)&__init_end) {
page = PAGE_OFFSET | CPHYSADDR(addr);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)