Defer LAPIC checking from pmap_bootstrap() to mp_enable()
authorMichael Neumann <mneumann@ntecs.de>
Sat, 2 Oct 2010 13:40:59 +0000 (15:40 +0200)
committerMichael Neumann <mneumann@ntecs.de>
Sat, 2 Oct 2010 13:40:59 +0000 (15:40 +0200)
Similar to commit 8b5fcfe2eabb8f50c8211d71788097cd4bfd98ba

sys/platform/pc64/x86_64/mp_machdep.c
sys/platform/pc64/x86_64/pmap.c

index cdcfa81..8e7c812 100644 (file)
@@ -550,6 +550,9 @@ mp_enable(u_int boot_addr)
 
        POSTCODE(MP_ENABLE_POST);
 
+       if (cpu_apic_address == 0)
+               panic("pmap_bootstrap: no local apic!");
+
 #if 0 /* JGXXX */
        /* turn on 4MB of V == P addressing so we can get to MP table */
        *(int *)PTD = PG_V | PG_RW | ((uintptr_t)(void *)KPTphys & PG_FRAME);
index 67d720d..dd5fea5 100644 (file)
@@ -697,10 +697,6 @@ pmap_bootstrap(vm_paddr_t *firstaddr)
 #endif
        }
 #endif
-#ifdef SMP
-       if (cpu_apic_address == 0)
-               panic("pmap_bootstrap: no local apic!");
-#endif
 
        /*
         * We need to finish setting up the globaldata page for the BSP.