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

• Lines: 32
• Date: Tue Apr 28 13:04:00 1998
• Orig file: v2.1.98/linux/arch/i386/mm/init.c
• Orig date: Wed Apr 8 19:36:25 1998

diff -u --recursive --new-file v2.1.98/linux/arch/i386/mm/init.c linux/arch/i386/mm/init.c
@@ -90,7 +90,6 @@
 			shared += atomic_read(&mem_map[i].count) - 1;
 	}
 	printk("%d pages of RAM\n",total);
-	printk("%d free pages\n",free);
 	printk("%d reserved pages\n",reserved);
 	printk("%d pages shared\n",shared);
 	printk("%d pages swap cached\n",cached);
@@ -257,6 +256,7 @@
 	}
 #ifdef __SMP__
 {
+	extern unsigned long mp_lapic_addr;
 	pte_t pte;
 	unsigned long apic_area = (unsigned long)APIC_BASE;
 
@@ -267,10 +267,13 @@
 
 	if (smp_found_config) {
 		/*
-		 * Map the local APIC to FEE00000.
+		 * Map the local APIC to FEE00000. (it's only the default
+		 * value, thanks to Steve Hsieh for finding this out. We
+		 * now save the real local-APIC physical address in smp_scan(),
+		 * and use it here)
 		 */
 		pg_table = pte_offset((pmd_t *)pg_dir, apic_area);
-		pte = mk_pte(__va(apic_area), PAGE_KERNEL);
+		pte = mk_pte(__va(mp_lapic_addr), PAGE_KERNEL);
 		set_pte(pg_table, pte);
 
 		/*