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

Next file: linux/arch/sh/boot/compressed/Makefile
Previous file: linux/arch/s390/mm/fault.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test5/linux/arch/s390/mm/init.c linux/arch/s390/mm/init.c
@@ -351,8 +351,8 @@
 
         addr = (unsigned long)(&__init_begin);
         for (; addr < (unsigned long)(&__init_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++;
         }
@@ -366,8 +366,8 @@
         if (start < end)
                 printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
         for (; start < end; start += PAGE_SIZE) {
-                ClearPageReserved(mem_map + MAP_NR(start));
-                set_page_count(mem_map+MAP_NR(start), 1);
+                ClearPageReserved(virt_to_page(start));
+                set_page_count(virt_to_page(start), 1);
                 free_page(start);
                 totalram_pages++;
         }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)