Merge with Linux 2.4.0-test6-pre8.

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index f798ef968..5e0632a86 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -270,8 +270,8 @@ void free_initmem(void)
 	
 	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++;
 	}
@@ -283,8 +283,8 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 {
 	unsigned long p;
 	for (p = start; p < end; p += PAGE_SIZE) {
-		ClearPageReserved(mem_map + MAP_NR(p));
-		set_page_count(mem_map+MAP_NR(p), 1);
+		ClearPageReserved(virt_to_page(p));
+		set_page_count(virt_to_page(p), 1);
 		free_page(p);
 		totalram_pages++;
 	}