patch-2.4.0-test6 linux/arch/sparc/kernel/sun4m_smp.c

Next file: linux/arch/sparc/mm/generic.c
Previous file: linux/arch/sparc/kernel/sun4d_smp.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test5/linux/arch/sparc/kernel/sun4m_smp.c linux/arch/sparc/kernel/sun4m_smp.c
@@ -279,22 +279,22 @@
 	
 	/* Free unneeded trap tables */
 	if (!(cpu_present_map & (1 << 1))) {
-		ClearPageReserved(mem_map + MAP_NR(trapbase_cpu1));
-		set_page_count(mem_map + MAP_NR(trapbase_cpu1), 1);
+		ClearPageReserved(virt_to_page(trapbase_cpu1));
+		set_page_count(virt_to_page(trapbase_cpu1), 1);
 		free_page((unsigned long)trapbase_cpu1);
 		totalram_pages++;
 		num_physpages++;
 	}
 	if (!(cpu_present_map & (1 << 2))) {
-		ClearPageReserved(mem_map + MAP_NR(trapbase_cpu2));
-		set_page_count(mem_map + MAP_NR(trapbase_cpu2), 1);
+		ClearPageReserved(virt_to_page(trapbase_cpu2));
+		set_page_count(virt_to_page(trapbase_cpu2), 1);
 		free_page((unsigned long)trapbase_cpu2);
 		totalram_pages++;
 		num_physpages++;
 	}
 	if (!(cpu_present_map & (1 << 3))) {
-		ClearPageReserved(mem_map + MAP_NR(trapbase_cpu3));
-		set_page_count(mem_map + MAP_NR(trapbase_cpu3), 1);
+		ClearPageReserved(virt_to_page(trapbase_cpu3));
+		set_page_count(virt_to_page(trapbase_cpu3), 1);
 		free_page((unsigned long)trapbase_cpu3);
 		totalram_pages++;
 		num_physpages++;

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