patch-2.1.103 linux/arch/i386/mm/init.c

Next file: linux/arch/mips/mm/r4xx0.c
Previous file: linux/arch/i386/kernel/time.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.102/linux/arch/i386/mm/init.c linux/arch/i386/mm/init.c
@@ -273,7 +273,7 @@
 		 * and use it here)
 		 */
 		pg_table = pte_offset((pmd_t *)pg_dir, apic_area);
-		pte = mk_pte(__va(mp_lapic_addr), PAGE_KERNEL);
+		pte = mk_pte_phys(mp_lapic_addr, PAGE_KERNEL);
 		set_pte(pg_table, pte);
 
 		/*
@@ -281,7 +281,7 @@
 		 */
 		apic_area = 0xFEC00000; /*(unsigned long)IO_APIC_BASE;*/
 		pg_table = pte_offset((pmd_t *)pg_dir, apic_area);
-		pte = mk_pte(__va(apic_area), PAGE_KERNEL);
+		pte = mk_pte_phys(apic_area, PAGE_KERNEL);
 		set_pte(pg_table, pte);
 	} else {
 		/*

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov