From 1694150cfc4e8f4c92b1ed595652d3d2bbc70cc2 Mon Sep 17 00:00:00 2001
From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Sat, 12 Feb 2011 17:09:14 +0800
Subject: [PATCH] x86_64: pmap_init() is called early enough for pmap_mapdev()
 to work

---
 sys/platform/pc64/apic/mpapic.c | 10 ----------
 sys/platform/pc64/x86_64/pmap.c | 11 -----------
 2 files changed, 21 deletions(-)

diff --git a/sys/platform/pc64/apic/mpapic.c b/sys/platform/pc64/apic/mpapic.c
index 1c8b583b13..dc125a4916 100644
--- a/sys/platform/pc64/apic/mpapic.c
+++ b/sys/platform/pc64/apic/mpapic.c
@@ -1065,21 +1065,11 @@ u_sleep(int count)
 		 /* spin */ ;
 }
 
-/*
- * XXX: Hack: Used by pmap_init
- */
-vm_offset_t cpu_apic_addr;
-
 void
 lapic_map(vm_offset_t lapic_addr)
 {
-	/*
-	 * lapic not mapped yet (pmap_init is called too late)
-	 */
 	lapic = pmap_mapdev_uncacheable(lapic_addr, sizeof(struct LAPIC));
 
-	cpu_apic_addr = lapic_addr;
-
 	kprintf("lapic: at 0x%08lx\n", lapic_addr);
 }
 
diff --git a/sys/platform/pc64/x86_64/pmap.c b/sys/platform/pc64/x86_64/pmap.c
index cce17c6fe9..3ab87c925b 100644
--- a/sys/platform/pc64/x86_64/pmap.c
+++ b/sys/platform/pc64/x86_64/pmap.c
@@ -738,11 +738,6 @@ pmap_set_opt(void)
 }
 #endif
 
-/*
- * XXX: Hack. Required by pmap_init()
- */
-extern vm_offset_t cpu_apic_addr;
-
 /*
  *	Initialize the pmap module.
  *	Called by vm_init, to initialize any structures that the pmap
@@ -791,12 +786,6 @@ pmap_init(void)
 	 * Now it is safe to enable pv_table recording.
 	 */
 	pmap_initialized = TRUE;
-#ifdef SMP
-	/*
-	 * XXX: Hack 
-	 */
-	lapic = pmap_mapdev_uncacheable(cpu_apic_addr, sizeof(struct LAPIC));
-#endif
 }
 
 /*
-- 
2.41.0