patch-2.4.0-test6 linux/arch/arm/mm/init.c

• Lines: 31
• Date: Mon Aug 7 21:02:27 2000
• Orig file: v2.4.0-test5/linux/arch/arm/mm/init.c
• Orig date: Thu Jul 27 17:37:59 2000

diff -u --recursive --new-file v2.4.0-test5/linux/arch/arm/mm/init.c linux/arch/arm/mm/init.c
@@ -534,8 +534,8 @@
 	memzero(zero_page, PAGE_SIZE);
 	memzero(bad_page, PAGE_SIZE);
 
-	empty_zero_page = mem_map + MAP_NR(zero_page);
-	empty_bad_page  = mem_map + MAP_NR(bad_page);
+	empty_zero_page = virt_to_page(zero_page);
+	empty_bad_page  = virt_to_page(bad_page);
 	empty_bad_pte_table = ((pte_t *)bad_table) + TABLE_OFFSET;
 }
 
@@ -598,7 +598,7 @@
 static inline void free_area(unsigned long addr, unsigned long end, char *s)
 {
 	unsigned int size = (end - addr) >> 10;
-	struct page *page = mem_map + MAP_NR(addr);
+	struct page *page = virt_to_page(addr);
 
 	for (; addr < end; addr += PAGE_SIZE, page ++) {
 		ClearPageReserved(page);
@@ -632,8 +632,8 @@
 
 	if (!keep_initrd) {
 		for (addr = start; addr < end; addr += PAGE_SIZE) {
-			ClearPageReserved(mem_map + MAP_NR(addr));
-			set_page_count(mem_map+MAP_NR(addr), 1);
+			ClearPageReserved(virt_to_page(addr));
+			set_page_count(virt_to_page(addr), 1);
 			free_page(addr);
 			totalram_pages++;
 		}